David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
6lowpan	6lowpan: use rb_entry()	2017-01-22 16:46:13 -05:00
9p	IB/core: add support to create a unsafe global rkey to ib_create_pd	2016-09-23 13:47:44 -04:00
802	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
8021q	net: make ndo_get_stats64 a void function	2017-01-08 17:51:44 -05:00
appletalk
atm	net: atm: Fix warnings in net/atm/lec.c when !CONFIG_PROC_FS	2016-12-28 15:11:32 -05:00
ax25	ax25: Fix segfault after sock connection timeout	2017-01-16 14:39:58 -05:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-12-16 10:24:44 -08:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
caif	net: caif: Remove unused stats member from struct chnl_net	2017-01-19 11:45:21 -05:00
can	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
ceph	libceph: make sure ceph_aes_crypt() IV is aligned	2017-01-18 17:58:45 +01:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
dcb	net: dcb: set error code on failures	2016-12-03 23:54:25 -05:00
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
decnet	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
dns_resolver
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
ethernet	net: make default TX queue length a defined constant	2016-11-07 20:15:55 -05:00
hsr	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
ieee802154	Makefile: drop -D__CHECK_ENDIAN__ from cflags	2016-12-16 00:13:43 +02:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
ipx	ktime: Get rid of the union	2016-12-25 17:21:22 +01:00
irda	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
iucv	net/af_iucv: don't use paged skbs for TX on HiperSockets	2017-01-10 21:08:29 -05:00
kcm	Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-07 15:36:58 -07:00
key	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
l2tp	net: make ndo_get_stats64 a void function	2017-01-08 17:51:44 -05:00
l3mdev
lapb	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
llc	net: fix sleeping for sk_wait_event()	2016-11-14 13:17:21 -05:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
mac802154	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
mpls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
ncsi	net/ncsi: Improve HNCDSC AEN handler	2016-10-20 11:23:08 -04:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
netlabel	netlabel: add CALIPSO to the list of built-in protocols	2017-01-06 22:20:45 -05:00
netlink	net: adjust skb->truesize in pskb_expand_head()	2017-01-27 12:03:29 -05:00
netrom
nfc	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-17 15:19:37 -05:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
phonet	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
psample	net: Introduce psample, a new genetlink channel for packet sampling	2017-01-24 13:44:28 -05:00
qrtr	net: qrtr: Mark 'buf' as little endian	2017-01-10 20:45:04 -05:00
rds	RDS: validate the requested traces user input against max supported	2017-01-06 22:14:26 -05:00
rfkill	rfkill: Add rfkill-any LED trigger	2017-01-09 11:40:33 +01:00
rose	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
rxrpc	rxrpc: Allow listen(sock, 0) to be used to disable listening	2017-01-09 11:10:02 +00:00
sched	net sched actions: Add support for user cookies	2017-01-25 12:37:04 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
smc	smc: ETH_ALEN as memcpy length for mac addresses	2017-01-12 09:47:01 -05:00
strparser	strparser: Propagate correct error code in strp_recv()	2016-10-12 01:51:49 -04:00
sunrpc	svcrdma: avoid duplicate dma unmapping during error recovery	2017-01-12 16:14:47 -05:00
switchdev	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-30 12:42:58 -04:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
unix	af_unix: move unix_mknod() out of bindlock	2017-01-24 14:30:56 -05:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-12-17 20:17:04 -08:00
wimax	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
wireless	net: adjust skb->truesize in pskb_expand_head()	2017-01-27 12:03:29 -05:00
x25	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
xfrm	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
compat.c	net: Assert at build time the assumptions we make about the CMSG header.	2017-01-04 13:24:19 -05:00
Kconfig	net: Introduce psample, a new genetlink channel for packet sampling	2017-01-24 13:44:28 -05:00
Makefile	net: Introduce psample, a new genetlink channel for packet sampling	2017-01-24 13:44:28 -05:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-11 14:43:39 -05:00
sysctl_net.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2016-10-06 09:52:23 -07:00