David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
6lowpan	6lowpan: ndisc: set invalid unicast short addr to unspec	2016-07-08 13:23:12 +02:00
9p	9p/trans_virtio: use kvfree() for iov_iter_get_pages_alloc()	2016-08-09 13:42:36 +03:00
802
8021q	net: remove type_check from dev_get_nest_level()	2016-08-13 15:15:54 -07:00
appletalk
atm	net: add dev arg to ndo_neigh_construct/destroy	2016-07-05 09:06:28 -07:00
ax25	AX.25: Close socket connection on session completion	2016-06-18 20:55:34 -07:00
batman-adv	batman-adv: Indicate netlink socket can be used with netns.	2016-08-09 07:54:43 +02:00
bluetooth	Bluetooth: Add debugfs fields for hardware and firmware info	2016-07-18 09:33:28 +03:00
bridge	bridge: Fix problems around fdb entries pointing to the bridge device	2016-08-09 21:42:44 -07:00
caif	caif: Remove unneeded header file	2016-06-28 05:26:14 -04:00
can	can: only call can_stat_update with procfs	2016-06-23 11:23:49 +02:00
ceph	libceph: using kfree_rcu() to simplify the code	2016-08-08 21:41:42 +02:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
dcb
dccp	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-07-29 17:38:46 -07:00
decnet	net: fix decnet rtnexthop parsing	2016-07-05 14:08:47 -07:00
dns_resolver
dsa	net: dsa: support switchdev ageing time attr	2016-07-19 19:42:01 -07:00
ethernet
hsr
ieee802154	ieee802154: 6lowpan: fix intra pan id check	2016-07-08 13:23:12 +02:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
ipx
irda	net/irda: handle iriap_register_lsap() allocation failure	2016-08-13 15:09:07 -07:00
iucv	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-07-29 17:38:46 -07:00
kcm	kcm: Use stream parser	2016-08-17 19:36:23 -04:00
key
l2tp	l2tp: Correctly return -EBADF from pppol2tp_getname.	2016-07-26 15:19:46 -07:00
l3mdev	net: vrf: Implement get_saddr for IPv6	2016-06-17 21:25:29 -07:00
lapb	net/lapb: tuse %*ph to dump buffers	2016-05-29 22:33:25 -07:00
llc
mac80211	mac80211: call get_expected_throughput only after adding station	2016-08-11 20:00:37 +02:00
mac802154
mpls	mpls: allow routes on ipip and sit devices	2016-07-09 17:45:56 -04:00
ncsi	net/ncsi: avoid maybe-uninitialized warning	2016-07-25 10:32:59 -07:00
netfilter	netfilter: nft_exthdr: Add size check on u8 nft_exthdr attributes	2016-08-10 13:10:13 +02:00
netlabel	netlabel: Implement CALIPSO config functions for SMACK.	2016-06-27 15:06:18 -04:00
netlink	net/netlink/af_netlink.h: Remove unused structure.	2016-06-09 22:26:24 -07:00
netrom
nfc	NFC: digital: Fix RTOX supervisor PDU handling	2016-07-11 02:02:03 +02:00
openvswitch	openvswitch: do not ignore netdev errors when creating tunnel vports	2016-08-10 23:13:23 -07:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-24 00:53:32 -04:00
phonet
qrtr
rds	RDS: add __printf format attribute to error reporting functions	2016-08-08 16:16:21 -07:00
rfkill
rose	rose: limit sk_filter trim to payload	2016-07-13 11:53:40 -07:00
rxrpc	rxrpc: Free packets discarded in data_ready	2016-08-09 17:13:56 +01:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
sctp	net/sctp: always initialise sctp_ht_iter::start_fail	2016-08-13 15:10:16 -07:00
strparser	strparser: Stream parser for messages	2016-08-17 19:36:23 -04:00
sunrpc	NFS client bugfixes for Linux 4.8	2016-08-12 12:32:24 -07:00
switchdev	switchdev: Put export declaration in the right place	2016-08-15 13:37:50 -07:00
tipc	tipc: fix NULL pointer dereference in shutdown()	2016-08-15 13:55:36 -07:00
unix	af_unix: charge buffers to kmemcg	2016-07-26 16:19:19 -07:00
vmw_vsock	vhost/vsock: drop space available check for TX vq	2016-08-15 05:05:21 +03:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
x25
xfrm
compat.c	packet: compat support for sock_fprog	2016-06-09 23:41:03 -07:00
Kconfig	strparser: Stream parser for messages	2016-08-17 19:36:23 -04:00
Makefile	strparser: Stream parser for messages	2016-08-17 19:36:23 -04:00
socket.c
sysctl_net.c	net: make net namespace sysctls belong to container's owner	2016-08-14 21:08:58 -07:00