David S. Miller 3313da8188 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The netfilter conflicts were rather simple overlapping changes. However, the cls_tcindex.c stuff was a bit more complex. On the 'net' side, Cong is fixing several races and memory leaks. Whilst on the 'net-next' side we have Vlad adding the rtnl-ness support. What I've decided to do, in order to resolve this, is revert the conversion over to using a workqueue that Cong did, bringing us back to pure RCU. I did it this way because I believe that either Cong's races don't apply with have Vlad did things, or Cong will have to implement the race fix slightly differently. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-15 12:38:38 -08:00
..
6lowpan	6lowpan: convert to DEFINE_SHOW_ATTRIBUTE	2018-12-19 00:28:05 +01:00
9p	9p/net: put a lower bound on msize	2018-12-25 17:07:49 +09:00
802
8021q	net: core: dev: Add extack argument to dev_change_flags()	2018-12-06 13:26:07 -08:00
appletalk
atm	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
ax25	ax25: fix possible use-after-free	2019-01-23 11:18:00 -08:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
bluetooth	socket: Use old_timeval types for socket timestamps	2019-02-03 11:17:30 -08:00
bpf	bpf: add BPF_PROG_TEST_RUN support for flow dissector	2019-01-29 01:08:29 +01:00
bpfilter	bpfilter: remove extra header search paths for bpfilter_umh	2019-02-03 20:11:43 -08:00
bridge	bridge: use struct_size() helper	2019-02-08 22:57:27 -08:00
caif	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
can	can: bcm: check timer values before ktime conversion	2019-01-22 11:33:46 +01:00
ceph	libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()	2019-01-21 14:53:12 +01:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
dcb
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-01-29 21:18:54 -08:00
dns_resolver	dns: Allow the dns resolver to retrieve a server set	2018-10-04 09:40:52 -07:00
dsa	net: dsa: microchip: add switch offload forwarding support	2019-02-11 12:46:51 -08:00
ethernet	net: ethernet: provide nvmem_get_mac_address()	2018-12-03 15:40:30 -08:00
hsr
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-24 16:19:56 -08:00
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
iucv	iucv: Remove SKB list assumptions.	2018-11-10 16:55:11 -08:00
kcm	Revert "kcm: remove any offset before parsing messages"	2018-09-17 18:43:42 -07:00
key	af_key: fix indentation on declaration statement	2018-11-15 18:09:32 +01:00
l2tp	l2tp: copy 4 more bytes to linear part if necessary	2019-01-31 08:58:46 -08:00
l3mdev	l3mdev: add function to retreive upper master	2018-12-03 14:15:26 -08:00
lapb
llc	llc: do not use sk_eat_skb()	2018-10-22 19:59:20 -07:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
mac802154	mac802154: Remove VLA usage of skcipher	2018-09-28 12:46:07 +08:00
mpls	mpls_iptunnel: use struct_size() helper	2019-02-08 22:57:27 -08:00
ncsi	net/ncsi: Add NCSI Mellanox OEM command	2018-11-27 16:37:20 -08:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
netlabel	netlabel: check for IPV4MASK in addrinfo_get	2018-09-21 18:58:34 -07:00
netlink	net: netlink: add helper to retrieve NETLINK_F_STRICT_CHK	2019-01-19 10:09:58 -08:00
netrom	netrom: switch to sock timer API	2019-01-27 10:38:04 -08:00
nfc	net: Revert recent Spectre-v1 patches.	2018-12-23 16:01:35 -08:00
nsh
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2019-01-28 17:34:38 -08:00
packet	net/packet: fix 4gb buffer limit due to overflow check	2019-02-12 13:37:23 -05:00
phonet	net: Revert recent Spectre-v1 patches.	2018-12-23 16:01:35 -08:00
psample
qrtr
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
rfkill	rfkill: gpio: Remove unused include	2018-12-18 13:13:56 +01:00
rose	net/rose: fix NULL ax25_cb kernel panic	2019-01-27 10:40:01 -08:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
smc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
strparser	bpf, sockmap: convert to generic sk_msg interface	2018-10-15 12:23:19 -07:00
sunrpc	svcrdma: Remove max_sge check at connect time	2019-02-06 15:32:34 -05:00
switchdev	net: Get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID	2019-02-06 14:17:03 -08:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
tls	net/tls: Do not use async crypto for non-data records	2019-02-12 12:35:14 -05:00
unix	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
x25	net/x25: do not hold the cpu too long in x25_new_lci()	2019-02-11 13:20:14 -08:00
xdp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-01-28 19:38:33 -08:00
xfrm	xfrm: Make set-mark default behavior backward compatible	2019-01-16 13:10:55 +01:00
compat.c	socket: Use old_timeval types for socket timestamps	2019-02-03 11:17:30 -08:00
Kconfig	net: convert bridge_nf to use skb extension infrastructure	2018-12-19 11:21:37 -08:00
Makefile
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
sysctl_net.c