Pablo Neira Ayuso a4ec80082c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Resolve conflict between commit 264640fc2c ("ipv6: distinguish frag queues by device for multicast and link-local packets") from the net tree and commit 029f7f3b87 ("netfilter: ipv6: nf_defrag: avoid/free clone operations") from the nf-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/ipv6/netfilter/nf_conntrack_reasm.c		2015-12-14 20:31:16 +01:00
..
6lowpan	6lowpan: put mcast compression in an own function	2015-10-21 00:49:25 +02:00
9p	IB/cma: Add support for network namespaces	2015-10-28 12:32:48 -04:00
802	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
8021q	vlan: Do not put vlan headers back on bridge and macvlan ports	2015-11-17 14:38:35 -05:00
appletalk	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
atm	net: Generalise wq_has_sleeper helper	2015-11-30 14:47:33 -05:00
ax25	NET: AX.25: Stop heartbeat timer on disconnect.	2015-07-15 15:59:58 -07:00
batman-adv	batman-adv: Act on NETDEV_*_TYPE_CHANGE events	2015-12-05 17:41:42 -05:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
bridge	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-12-14 20:31:16 +01:00
caif	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
can	can: avoid using timeval for uapi	2015-10-13 17:42:34 +02:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2015-11-13 09:24:40 -08:00
core	sock, cgroup: add sock->sk_cgroup	2015-12-08 22:02:33 -05:00
dcb	net/dcb: make dcbnl.c explicitly non-modular	2015-10-09 07:52:27 -07:00
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
decnet	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
dns_resolver	net: dns_resolver: convert time_t to time64_t	2015-11-18 16:27:46 -05:00
dsa	net: dsa: move dsa slave destroy code to slave.c	2015-12-07 16:35:50 -05:00
ethernet	net: help compiler generate better code in eth_get_headlen	2015-09-28 22:51:15 -07:00
hsr	net/hsr: fix a warning message	2015-11-23 14:56:15 -05:00
ieee802154	net: fix percpu memory leaks	2015-11-02 22:47:14 -05:00
ipv4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-12-14 20:31:16 +01:00
ipv6	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-12-14 20:31:16 +01:00
ipx	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
irda	TTY/Serial driver patches for 4.4-rc1	2015-11-04 21:35:12 -08:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
key	af_key: fix two typos	2015-10-23 03:05:19 -07:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
l3mdev	net: Add netif_is_l3_slave	2015-10-07 04:27:43 -07:00
lapb
llc	tcp: fix recv with flags MSG_WAITALL | MSG_PEEK	2015-07-27 01:06:53 -07:00
mac80211	mac80211: handle HW ROC expired properly	2015-12-07 11:06:37 +01:00
mac802154	mac802154: Delete an unnecessary check before the function call "kfree_skb"	2015-11-19 17:50:32 +01:00
mpls	mpls_iptunnel: add static qualifier to mpls_output	2015-12-11 20:17:43 -05:00
netfilter	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-12-14 20:31:16 +01:00
netlabel	netlink: implement nla_put_in_addr and nla_put_in6_addr	2015-03-31 13:58:35 -04:00
netlink	mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd	2015-11-06 17:50:42 -08:00
netrom	netfilter: Remove spurios included of netfilter.h	2015-06-18 21:14:32 +02:00
nfc	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
openvswitch	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-12-14 20:31:16 +01:00
packet	packet: Allow packets with only a header (but no payload)	2015-11-29 22:17:17 -05:00
phonet	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
rds	RDS: fix race condition when sending a message on unbound socket	2015-11-24 17:20:09 -05:00
rfkill	rfkill: Copy "all" global state to other types	2015-09-04 14:26:56 +02:00
rose	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-24 02:58:51 -07:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
sched	net_sched: fix qdisc_tree_decrease_qlen() races	2015-12-03 14:59:05 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 16:02:46 -08:00
switchdev	switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion	2015-11-03 13:39:21 -05:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
unix	af_unix: fix unix_dgram_recvmsg entry locking	2015-12-06 23:31:54 -05:00
vmw_vsock	Revert "Merge branch 'vsock-virtio'"	2015-12-08 21:55:49 -05:00
wimax	net:wimax: Fix doucble word "the the" in networking.xml	2015-08-09 22:43:52 -07:00
wireless	cfg80211: reg: Refactor calculation of bandwidth flags	2015-12-04 14:43:32 +01:00
x25	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2015-10-30 20:51:56 +09:00
compat.c	net: switch importing msghdr from userland to {compat_,}import_iovec()	2015-04-09 00:02:26 -04:00
Kconfig	net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct	2015-12-08 22:02:33 -05:00
Makefile	net: Introduce L3 Master device abstraction	2015-09-29 20:40:32 -07:00
socket.c	net: fix sock_wake_async() rcu protection	2015-12-01 15:45:05 -05:00
sysctl_net.c	net: sysctl: fix a kmemleak warning	2015-10-23 06:22:08 -07:00