David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
6lowpan	6lowpan: Don't set IFF_NO_QUEUE	2017-04-12 22:02:40 +02:00
9p	xen: fixes for 4.12 rc2	2017-05-19 15:06:48 -07:00
802
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
appletalk
atm
ax25
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
bpf	bpf: Align packet data properly in program testing framework.	2017-05-02 11:46:28 -04:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
caif	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
can	can: af_can: namespace support: fix lockdep splat: properly initialize spin_lock	2017-06-09 11:39:23 +02:00
ceph	libceph: cleanup old messages according to reconnect seq	2017-05-24 18:10:51 +02:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
dcb	dcb: enforce minimum length on IEEE_APPS attribute	2017-05-21 13:42:33 -04:00
dccp	dccp: do not use tcp_time_stamp	2017-05-17 16:06:01 -04:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
dns_resolver
dsa	net: dsa: Introduce dsa_get_cpu_port()	2017-06-13 16:35:03 -04:00
ethernet
hsr	hsr: fix incorrect warning	2017-06-12 15:21:20 -04:00
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
ipx	ipx: call ipxitf_put() in ioctl error path	2017-05-02 15:34:53 -04:00
irda	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
iucv
kcm	net: socket: mark socket protocol handler structs as const	2017-05-16 11:54:07 -04:00
key	af_key: Fix slab-out-of-bounds in pfkey_compile_policy.	2017-05-08 08:03:01 +02:00
l2tp	l2tp: cast l2tp traffic counter to unsigned	2017-06-10 16:14:27 -04:00
l3mdev
lapb
llc	net: llc: add lock_sock in llc_ui_bind to avoid a race condition	2017-05-26 14:20:29 -04:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
mac802154	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
mpls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
ncsi
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
netlabel	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
netlink	netlink: don't send unknown nsid	2017-06-01 11:49:39 -04:00
netrom
nfc	net: socket: mark socket protocol handler structs as const	2017-05-16 11:54:07 -04:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
packet	net/packet: remove unneeded declaraion of tpacket_snd().	2017-06-10 16:15:25 -04:00
phonet	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
psample
qrtr	net: qrtr: Inform open sockets about new controller	2017-06-08 11:34:57 -04:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-05-02 16:40:27 -07:00
rfkill	net: rfkill: gpio: Switch to devm_acpi_dev_add_driver_gpios()	2017-06-13 11:07:51 +02:00
rose
rxrpc	rxrpc: Cache the congestion window setting	2017-06-14 15:42:45 -04:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
smc	net/smc: Add warning about remote memory exposure	2017-05-16 14:49:43 -04:00
strparser
sunrpc	SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()	2017-05-31 12:26:44 -04:00
switchdev	net: switchdev: Change notifier chain to be atomic	2017-06-08 14:16:24 -04:00
tipc	net: tipc: Fix a sleep-in-atomic bug in tipc_msg_reverse	2017-06-10 18:20:38 -04:00
unix	af_unix: Add sockaddr length checks before accessing sa_family in bind and connect handlers	2017-06-09 10:10:24 -04:00
vmw_vsock	vsock: use new wait API for vsock_stream_sendmsg()	2017-05-22 14:39:36 -04:00
wimax
wireless	nl80211: add authorized flag to ROAM event	2017-06-13 11:04:37 +02:00
x25	net: x25: fix one potential use-after-free issue	2017-05-18 10:05:40 -04:00
xfrm	xfrm: fix state migration copy replay sequence numbers	2017-05-19 12:49:13 +02:00
compat.c
Kconfig
Makefile
socket.c	net: socket: fix a typo in sockfd_lookup().	2017-05-22 12:14:04 -04:00
sysctl_net.c	sysctl: Remove dead register_sysctl_root	2017-04-16 23:42:49 -05:00