summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2018-06-0479-2131/+408
|\
| * isdn: replace ->proc_fops with ->proc_showChristoph Hellwig2018-05-161-13/+1
| * atm: switch to proc_create_seq_privateChristoph Hellwig2018-05-161-59/+13
| * atm: simplify procfs codeChristoph Hellwig2018-05-161-58/+7
| * bluetooth: switch to proc_create_seq_dataChristoph Hellwig2018-05-161-35/+5
| * netfilter/x_tables: switch to proc_create_seq_privateChristoph Hellwig2018-05-161-36/+6
| * netfilter/xt_hashlimit: switch to proc_create_{seq,single}_dataChristoph Hellwig2018-05-161-74/+18
| * neigh: switch to proc_create_seq_dataChristoph Hellwig2018-05-161-25/+6
| * proc: introduce proc_create_net_singleChristoph Hellwig2018-05-1610-284/+49
| * proc: introduce proc_create_net{,_data}Christoph Hellwig2018-05-1649-855/+134
| * netfilter/x_tables: simplify ѕeq_file codeChristoph Hellwig2018-05-161-28/+11
| * net/kcm: simplify proc registrationChristoph Hellwig2018-05-161-54/+17
| * ipv6/flowlabel: simplify pid namespace lookupChristoph Hellwig2018-05-161-23/+6
| * ipv{4,6}/raw: simplify ѕeq_file codeChristoph Hellwig2018-05-162-26/+16
| * ipv{4,6}/ping: simplify proc file creationChristoph Hellwig2018-05-162-48/+37
| * ipv{4,6}/tcp: simplify procfs registrationChristoph Hellwig2018-05-162-62/+50
| * ipv{4,6}/udp{,lite}: simplify proc registrationChristoph Hellwig2018-05-164-101/+70
| * proc: introduce proc_create_single{,_data}Christoph Hellwig2018-05-165-73/+8
| * proc: introduce proc_create_seq_privateChristoph Hellwig2018-05-165-63/+11
| * proc: introduce proc_create_seq{,_data}Christoph Hellwig2018-05-1614-312/+41
| * net/can: single_open_net needs to be paired with single_release_netChristoph Hellwig2018-05-142-4/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-06-0219-64/+97
|\ \
| * | ip6_tunnel: remove magic mtu value 0xFFF8Nicolas Dichtel2018-06-012-5/+11
| * | ip_tunnel: restore binding to ifaces with a large mtuNicolas Dichtel2018-06-011-4/+4
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2018-06-012-4/+3
| |\ \
| | * | xfrm Fix potential error pointer dereference in xfrm_bundle_create.Steffen Klassert2018-05-311-3/+2
| | * | xfrm6: avoid potential infinite loop in _decode_session6()Eric Dumazet2018-05-141-1/+1
| * | | kcm: Fix use-after-free caused by clonned socketsKirill Tkhai2018-06-011-1/+1
| * | | net-sysfs: Fix memory leak in XPS configurationAlexander Duyck2018-05-311-3/+3
| * | | net/ncsi: Fix array size in dumpit handlerSamuel Mendoza-Jonas2018-05-311-1/+1
| * | | cls_flower: Fix incorrect idr release when failing to modify rulePaul Blakey2018-05-311-1/+1
| * | | ipv6: sr: fix memory OOB access in seg6_do_srh_encap/inlineMathieu Xhonneux2018-05-281-2/+2
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2018-05-289-43/+71
| |\ \ \
| | * | | netfilter: nf_tables: increase nft_counters_enabled in nft_chain_stats_replace()Taehee Yoo2018-05-291-1/+3
| | * | | netfilter: nf_tables: fix NULL-ptr in nf_tables_dump_obj()Taehee Yoo2018-05-291-2/+2
| | * | | netfilter: nf_tables: disable preemption in nft_update_chain_stats()Pablo Neira Ayuso2018-05-291-2/+2
| | * | | netfilter: provide correct argument to nla_strlcpy()Eric Dumazet2018-05-242-3/+3
| | * | | ipvs: fix buffer overflow with sync daemon and serviceJulian Anastasov2018-05-231-6/+15
| | * | | netfilter: nft_limit: fix packet ratelimitingPablo Neira Ayuso2018-05-231-14/+24
| | * | | netfilter: nft_meta: fix wrong value dereference in nft_meta_set_evalTaehee Yoo2018-05-231-6/+8
| | * | | netfilter: ebtables: handle string from userspace with carePaolo Abeni2018-05-171-1/+2
| | * | | netfilter: nf_tables: fix NULL pointer dereference on nft_ct_helper_obj_dump()Taehee Yoo2018-05-171-8/+12
* | | | | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdmaLinus Torvalds2018-06-023-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | IB: Revert "remove redundant INFINIBAND kconfig dependencies"Arnd Bergmann2018-05-283-3/+3
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-05-2514-48/+121
|\ \ \ \ \
| * \ \ \ \ Merge tag 'batadv-net-for-davem-20180524' of git://git.open-mesh.org/linux-mergeDavid S. Miller2018-05-252-18/+68
| |\ \ \ \ \
| | * | | | | batman-adv: prevent TT request storms by not sending inconsistent TT TLVLsMarek Lindner2018-05-121-3/+12
| | * | | | | batman-adv: Fix TT sync flags for intermediate TT responsesLinus Lüssing2018-05-121-10/+51
| | * | | | | batman-adv: Avoid race in TT TVLV allocator helperSven Eckelmann2018-05-101-4/+4
| | * | | | | batman-adv: don't pass a NULL hard_iface to batadv_hardif_putColin Ian King2018-04-221-1/+1