summaryrefslogtreecommitdiff
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-149-17/+50
| |\ \ \
| | * | | tcp: tcp_make_synack() should clear skb->tstampEric Dumazet2015-04-091-0/+2
| | * | | udptunnels: Call handle_offloads after inserting vlan tag.Jesse Gross2015-04-091-4/+4
| | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-04-092-7/+6
| | |\ \ \
| | | * | | vti6: fix uninit when using x-netnsYao Xiwei2015-04-071-2/+1
| | | * | | xfrm: fix xfrm_input/xfrm_tunnel_check oopsAlexey Dobriyan2015-04-071-5/+5
| | * | | | fou: Don't use const __read_mostlyAndi Kleen2015-04-081-2/+2
| | * | | | RDS: make sure not to loop forever inside rds_send_xmitSowmini Varadhan2015-04-083-2/+33
| | * | | | RDS: only use passive connections when addresses matchSowmini Varadhan2015-04-081-1/+1
| | * | | | netem: Fixes byte backlog accounting for the first of two chained netem insta...Beshay, Joseph2015-04-071-1/+2
| | |/ / /
| * | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...David S. Miller2015-04-1310-111/+196
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | new helper: msg_data_left()Al Viro2015-04-114-17/+16
| | * | | Merge remote-tracking branch 'dh/afs' into for-davemAl Viro2015-04-114-29/+148
| | |\ \ \
| | | * | | RxRPC: Handle VERSION Rx protocol packetsDavid Howells2015-04-013-1/+122
| | | * | | RxRPC: Use iov_iter_count() in rxrpc_send_data() instead of the len argumentDavid Howells2015-04-011-13/+11
| | | * | | RxRPC: Don't call skb_add_data() if there's no data to copyDavid Howells2015-04-011-19/+19
| | | * | | RxRPC: Fix the conversion to iov_iterDavid Howells2015-04-011-2/+2
| | * | | | get rid of the size argument of sock_sendmsg()Al Viro2015-04-112-14/+15
View Lorry Controller Status