David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
6lowpan
9p	net/9p: switch p9_fd_read to kernel_write	2017-09-04 19:05:16 -04:00
802
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-05 18:19:22 -07:00
appletalk
atm	net: atm/mpc: Stop using open-coded timer .data field	2017-10-25 13:07:37 +09:00
ax25	net: ax25: Convert timers to use timer_setup()	2017-10-25 12:03:56 +09:00
batman-adv	batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation	2017-10-17 08:09:47 +02:00
bluetooth	Bluetooth: Fix compiler warning with selftest duration calculation	2017-10-06 21:49:13 +03:00
bpf	bpf: add meta pointer for direct access	2017-09-26 13:36:44 -07:00
bridge	bridge: vlan: signal if anything changed on vlan add	2017-10-29 11:03:43 +09:00
caif
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
ceph	libceph: don't allow bidirectional swap of pg-upmap-items	2017-09-19 20:34:29 +02:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
dcb	rtnetlink: make rtnl_register accept a flags parameter	2017-08-09 16:57:38 -07:00
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
decnet	decnet: af_decnet: mark expected switch fall-throughs	2017-10-18 14:10:29 +01:00
dns_resolver	KEYS: Fix race between updating and finding a negative key	2017-10-18 09:12:40 +01:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
ethernet
hsr	net: hsr: Convert timers to use timer_setup()	2017-10-25 13:00:27 +09:00
ieee802154	Merge remote-tracking branch 'net-next/master'	2017-10-18 17:40:18 +02:00
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
ipx	net: ipx: mark expected switch fall-through	2017-10-18 14:13:08 +01:00
iucv
kcm	kcm: Remove redundant unlikely()	2017-09-26 09:54:06 -07:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-15 20:23:23 -07:00
l2tp	l2tp: initialise PPP sessions before registering them	2017-10-29 11:16:22 +09:00
l3mdev
lapb	net/lapb: Convert timers to use timer_setup()	2017-10-18 12:39:36 +01:00
llc	net: LLC: Convert timers to use timer_setup()	2017-10-25 12:06:25 +09:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
mac802154	mac802154: Fix MAC header and payload encrypted	2017-09-20 13:37:16 +02:00
mpls	ip_tunnel: fix building with NET_IP_TUNNEL=m	2017-10-12 12:21:11 -07:00
ncsi	net/ncsi: Fix length of GVI response packet	2017-10-21 01:56:38 +01:00
netfilter	bpf: Add file mode configuration into bpf maps	2017-10-20 13:32:59 +01:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
netrom	net: netrom: nr_in: mark expected switch fall-through	2017-10-22 02:00:33 +01:00
nfc	net: nfc: llcp_core: use setup_timer() helper.	2017-09-25 13:19:20 -07:00
nsh	nsh: add GSO support	2017-08-29 15:16:52 -07:00
openvswitch	openvswitch: conntrack: mark expected switch fall-through	2017-10-22 02:01:26 +01:00
packet	net: af_packet: Convert timers to use timer_setup()	2017-10-25 13:01:12 +09:00
phonet	net: phonet: mark phonet_protocol as const	2017-10-07 23:15:08 +01:00
psample
qrtr	net: qrtr: Support decoding incoming v2 packets	2017-10-11 15:28:39 -07:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
rfkill
rose	net: rose: mark expected switch fall-throughs	2017-10-22 02:02:26 +01:00
rxrpc	net: rxrpc: mark expected switch fall-throughs	2017-10-24 18:27:06 +09:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
smc	smc: add SMC rendezvous protocol	2017-10-26 18:00:29 +09:00
strparser	strparser: Use delayed work instead of timer for msg timeout	2017-10-25 10:37:11 +09:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
switchdev	net: switchdev: Remove bridge bypass support from switchdev	2017-08-07 14:48:48 -07:00
tipc	tipc: fix a dangling pointer	2017-10-26 17:46:53 +09:00
tls	tls: make tls_sw_free_resources static	2017-09-14 09:55:21 -07:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
vmw_vsock	vsock: always call vsock_init_tables()	2017-10-26 17:45:58 +09:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
x25	net: x25: mark expected switch fall-throughs	2017-10-22 03:08:46 +01:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
compat.c	net: compat: assert the size of cmsg copied in is as expected	2017-09-20 15:36:18 -07:00
Kconfig	net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.	2017-09-04 13:25:20 +02:00
Makefile	nsh: add GSO support	2017-08-29 15:16:52 -07:00
socket.c	net: fixes for skb_send_sock	2017-08-16 11:27:52 -07:00
sysctl_net.c