Jason Gunthorpe 0a3173a5f0 Merge branch 'linus/master' into rdma.git for-next ... rdma.git merge resolution for the 4.19 merge window Conflicts: drivers/infiniband/core/rdma_core.c - Use the rdma code and revise with the new spelling for atomic_fetch_add_unless drivers/nvme/host/rdma.c - Replace max_sge with max_send_sge in new blk code drivers/nvme/target/rdma.c - Use the blk code and revise to use NULL for ib_post_recv when appropriate - Replace max_sge with max_recv_sge in new blk code net/rds/ib_send.c - Use the net code and revise to use NULL for ib_post_recv when appropriate Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>		2018-08-16 14:21:29 -06:00
..
datagram.c	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
dev_addr_lists.c
dev_ioctl.c	net: remove redundant input checks in SIOCSIFTXQLEN case of dev_ifsioc	2018-07-24 11:36:15 -07:00
dev.c	net: allow to call netif_reset_xps_queues() under cpus_read_lock	2018-08-09 14:25:06 -07:00
devlink.c	devlink: Add generic parameters region_snapshot	2018-07-12 17:37:13 -07:00
drop_monitor.c
dst_cache.c
dst.c	netfilter: nf_tables: add tunnel support	2018-08-03 21:12:12 +02:00
ethtool.c	net: Add TLS RX offload feature	2018-07-16 00:12:09 -07:00
failover.c
fib_notifier.c
fib_rules.c	fib_rules: NULL check before kfree is not needed	2018-07-30 09:44:06 -07:00
filter.c	net: filter: mark expected switch fall-through	2018-08-14 10:11:26 -07:00
flow_dissector.c	flow_dissector: allow dissection of tunnel options from metadata	2018-08-07 12:22:14 -07:00
gen_estimator.c	net: core: protect rate estimator statistics pointer with lock	2018-08-11 12:37:10 -07:00
gen_stats.c	gen_stats: Fix netlink stats dumping in the presence of padding	2018-07-04 14:44:45 +09:00
gro_cells.c
hwbm.c
link_watch.c
lwt_bpf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-08-07 11:02:05 -07:00
lwtunnel.c
Makefile
neighbour.c	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
net_namespace.c	net: create reusable function for getting ownership info of sysfs inodes	2018-07-20 23:44:36 -07:00
net-procfs.c
net-sysfs.c	net: allow to call netif_reset_xps_queues() under cpus_read_lock	2018-08-09 14:25:06 -07:00
net-sysfs.h
net-traces.c
netclassid_cgroup.c
netevent.c
netpoll.c
netprio_cgroup.c
page_pool.c	net/page_pool: Fix inconsistent lock state warning	2018-07-19 23:23:01 -07:00
pktgen.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2018-07-27 09:33:37 -07:00
ptp_classifier.c
request_sock.c
rtnetlink.c	net: report invalid mtu value via netlink extack	2018-07-29 12:57:26 -07:00
scm.c
secure_seq.c	infiniband: i40iw, nes: don't use wall time for TCP sequence numbers	2018-07-11 12:10:19 -06:00
skbuff.c	net: Export skb_headers_offset_update	2018-08-10 16:12:20 +02:00
sock_diag.c	net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()	2018-08-14 10:01:24 -07:00
sock_reuseport.c	bpf: Enable BPF_PROG_TYPE_SK_REUSEPORT bpf prog in reuseport selection	2018-08-11 01:58:46 +02:00
sock.c	net: avoid unnecessary sock_flag() check when enable timestamp	2018-08-06 10:42:48 -07:00
stream.c
sysctl_net_core.c
timestamping.c
tso.c
utils.c	net: Remove some unneeded semicolon	2018-08-04 13:05:39 -07:00
xdp.c	xdp: Helpers for disabling napi_direct of xdp_return_frame	2018-08-10 16:12:21 +02:00