summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2015-04-184-14/+52
|\
| * net/9p: add a privport option for RDMA transport.Dominique Martinet2015-03-211-8/+44
| * net/9p: Initialize opts->privport as it should be.Dominique Martinet2015-03-211-0/+1
| * net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show()Andrey Ryabinin2015-03-201-1/+4
| * 9p: use unsigned integers for nwqid/countKirill A. Shutemov2015-03-201-3/+3
| * 9p: remove unused variable in p9_fd_create()Fabian Frederick2015-03-201-2/+0
* | Bluetooth: hidp: Fix regression with older userspace and flags validationMarcel Holtmann2015-04-181-1/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-1716-42/+91
|\ \
| * | net: dsa: use DEVICE_ATTR_RW to declare temp1_maxVivien Didelot2015-04-171-3/+3
| * | net: remove unused 'dev' argument from netif_needs_gso()Johannes Berg2015-04-171-1/+1
| * | act_mirred: Fix bogus header when redirecting from VLANHerbert Xu2015-04-171-1/+1
| * | inet_diag: fix access to tcp cc informationEric Dumazet2015-04-176-17/+35
| * | tcp: tcp_get_info() should fetch socket fields onceEric Dumazet2015-04-171-4/+6
| * | skbuff: Do not scrub skb mark within the same name spaceHerbert Xu2015-04-161-3/+6
| * | Revert "net: Reset secmark when scrubbing packet"Herbert Xu2015-04-161-1/+0
| * | bpf: fix bpf helpers to use skb->mac_header relative offsetsAlexei Starovoitov2015-04-163-9/+38
| * | netns: remove duplicated include from net_namespace.cWei Yongjun2015-04-161-1/+0
| * | fou: avoid missing unlock in failure pathWANG Cong2015-04-161-2/+1
* | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-04-152-3/+7
|\ \ \
| * | | lib/string_helpers.c: change semantics of string_escape_memRasmus Villemoes2015-04-151-3/+5
| * | | kernel: conditionally support non-root users, groups and capabilitiesIulia Manda2015-04-151-0/+2
| |/ /
* | | Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-04-156-258/+211
|\ \ \ | |/ / |/| |
| * | make new_sync_{read,write}() staticAl Viro2015-04-111-2/+0
| * | net/9p: remove (now-)unused helpersAl Viro2015-04-112-43/+1
| * | p9_client_attach(): set fid->uid correctlyAl Viro2015-04-111-0/+1
| * | 9p: switch p9_client_read() to passing struct iov_iter *Al Viro2015-04-111-63/+61
| * | 9p: switch p9_client_write() to passing it struct iov_iter *Al Viro2015-04-111-57/+41
| * | net/9p: switch the guts of p9_client_{read,write}() to iov_iterAl Viro2015-04-113-132/+146
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-04-15468-11521/+19500
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-04-1431-543/+623
| |\ \ \
| | * | | netfilter: nf_tables: get rid of the expression example codePablo Neira Ayuso2015-04-131-94/+0
| | * | | netfilter: nft_dynset: dynamic stateful expression instantiationPatrick McHardy2015-04-131-4/+50
| | * | | netfilter: nf_tables: add flag to indicate set contains expressionsPatrick McHardy2015-04-132-2/+9
| | * | | netfilter: nf_tables: mark stateful expressionsPatrick McHardy2015-04-132-0/+2
| | * | | netfilter: nf_tables: prepare for expressions associated to set elementsPatrick McHardy2015-04-131-0/+9
| | * | | netfilter: nf_tables: add helper functions for expression handlingPatrick McHardy2015-04-131-5/+51
| | * | | netfilter: nf_tables: variable sized set element keys / dataPatrick McHardy2015-04-133-18/+16
| | * | | netfilter: nf_tables: support variable sized data in nft_data_init()Patrick McHardy2015-04-134-16/+28
| | * | | netfilter: nf_tables: switch registers to 32 bit addressingPatrick McHardy2015-04-1314-39/+75
| | * | | netfilter: nf_tables: add register parsing/dumping helpersPatrick McHardy2015-04-1314-53/+65
| | * | | netfilter: nf_tables: convert sets to u32 data pointersPatrick McHardy2015-04-132-8/+6
| | * | | netfilter: nf_tables: kill nft_data_cmp()Patrick McHardy2015-04-133-8/+7
| | * | | netfilter: nf_tables: convert expressions to u32 register pointersPatrick McHardy2015-04-138-67/+63
| | * | | netfilter: nf_tables: use struct nft_verdict within struct nft_dataPatrick McHardy2015-04-131-17/+21
| | * | | netfilter: nf_tables: get rid of NFT_REG_VERDICT usagePatrick McHardy2015-04-1327-120/+115
| | * | | netfilter: nf_tables: introduce nft_validate_register_load()Patrick McHardy2015-04-1310-38/+61
| | * | | netfilter: nf_tables: kill nft_validate_output_register()Patrick McHardy2015-04-1310-76/+14
| | * | | netfilter: nft_lookup: use nft_validate_register_store() to validate typesPatrick McHardy2015-04-132-8/+8
| | * | | netfilter: nf_tables: rename nft_validate_data_load()Patrick McHardy2015-04-139-27/+29
| | * | | netfilter: nf_tables: validate len in nft_validate_data_load()Patrick McHardy2015-04-139-45/+96
OpenPOWER on IntegriCloud