summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2018-06-0455-221/+154
|\
| * net/rxrpc: convert to ->poll_maskChristoph Hellwig2018-05-261-7/+3
| * net/iucv: convert to ->poll_maskChristoph Hellwig2018-05-261-5/+2
| * net/phonet: convert to ->poll_maskChristoph Hellwig2018-05-261-5/+2
| * net/nfc: convert to ->poll_maskChristoph Hellwig2018-05-261-6/+3
| * net/caif: convert to ->poll_maskChristoph Hellwig2018-05-261-8/+4
| * net/bluetooth: convert to ->poll_maskChristoph Hellwig2018-05-264-8/+5
| * net/sctp: convert to ->poll_maskChristoph Hellwig2018-05-263-5/+3
| * net/tipc: convert to ->poll_maskChristoph Hellwig2018-05-261-9/+5
| * net/vmw_vsock: convert to ->poll_maskChristoph Hellwig2018-05-261-13/+6
| * net/atm: convert to ->poll_maskChristoph Hellwig2018-05-264-11/+6
| * net/dccp: convert to ->poll_maskChristoph Hellwig2018-05-264-15/+5
| * net: convert datagram_poll users tp ->poll_maskChristoph Hellwig2018-05-2626-53/+47
| * net/unix: convert to ->poll_maskChristoph Hellwig2018-05-261-19/+11
| * net/tcp: convert to ->poll_maskChristoph Hellwig2018-05-263-19/+8
| * net: remove sock_no_pollChristoph Hellwig2018-05-264-9/+0
| * net: add support for ->poll_mask in proto_opsChristoph Hellwig2018-05-261-5/+43
| * net: refactor socket_pollChristoph Hellwig2018-05-261-17/+4
| * fs: add new vfs_poll and file_can_poll helpersChristoph Hellwig2018-05-261-14/+4
* | Merge tag 'dma-mapping-4.18' of git://git.infradead.org/users/hch/dma-mappingLinus Torvalds2018-06-041-19/+1
|\ \
| * | net: remove the PCI_DMA_BUS_IS_PHYS check in illegal_highdmaChristoph Hellwig2018-05-071-19/+1
| |/
* | Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-06-041-16/+0
|\ \
| * | remove rpc_rmdir()Al Viro2018-04-161-16/+0
* | | 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