David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... There were quite a few overlapping sets of changes here. Daniel's bug fix for off-by-ones in the new BPF branch instructions, along with the added allowances for "data_end > ptr + x" forms collided with the metadata additions. Along with those three changes came veritifer test cases, which in their final form I tried to group together properly. If I had just trimmed GIT's conflict tags as-is, this would have split up the meta tests unnecessarily. In the socketmap code, a set of preemption disabling changes overlapped with the rename of bpf_compute_data_end() to bpf_compute_data_pointers(). Changes were made to the mv88e6060.c driver set addr method which got removed in net-next. The hyperv transport socket layer had a locking change in 'net' which overlapped with a change of socket state macro usage in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-22 13:39:14 +01: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: Convert timers to use timer_setup()	2017-10-18 12:40:27 +01:00
ax25
batman-adv	This cleanup patchset includes the following patches:	2017-10-06 10:12:52 -07: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01: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-22 13:39:14 +01: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-22 13:39:14 +01: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	net: sched: avoid ndo_setup_tc calls for TC_SETUP_CLS*	2017-10-21 03:04:08 +01:00
ethernet
hsr	net/hsr: Check skb_put_padto() return value	2017-08-22 13:40:23 -07: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-22 13:39:14 +01:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
l3mdev
lapb	net/lapb: Convert timers to use timer_setup()	2017-10-18 12:39:36 +01:00
llc
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01: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	RDS: IB: Initialize max_items based on underlying device attributes	2017-10-05 21:16:33 -07:00
rfkill
rose	net: rose: mark expected switch fall-throughs	2017-10-22 02:02:26 +01:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
sched	net: sched: mark expected switch fall-throughs	2017-10-22 02:07:08 +01:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
smc	net/smc: dev_put for netdev after usage of ib_query_gid()	2017-10-12 12:20:27 -07:00
strparser	strparser: initialize all callbacks	2017-08-24 21:57:50 -07:00
sunrpc	sunrpc: Convert timers to use timer_setup()	2017-10-18 12:40:27 +01:00
switchdev	net: switchdev: Remove bridge bypass support from switchdev	2017-08-07 14:48:48 -07:00
tipc	tipc: refactor tipc_sk_timeout() function	2017-10-22 02:36:35 +01:00
tls	tls: make tls_sw_free_resources static	2017-09-14 09:55:21 -07:00
unix	net: af_unix: mark expected switch fall-through	2017-10-22 03:07:50 +01:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
wimax
wireless	Three fixes for the recently added new code:	2017-10-14 18:36:46 -07:00
x25	net: x25: mark expected switch fall-throughs	2017-10-22 03:08:46 +01:00
xfrm	xfrm: Convert timers to use timer_setup()	2017-10-18 12:39:37 +01: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