Tejun Heo 0b98f0c042 Merge branch 'master' into for-4.4-fixes ... The following commit which went into mainline through networking tree 3b13758f51 ("cgroups: Allow dynamically changing net_classid") conflicts in net/core/netclassid_cgroup.c with the following pending fix in cgroup/for-4.4-fixes. 1f7dd3e5a6 ("cgroup: fix handling of multi-destination migration from subtree_control enabling") The former separates out update_classid() from cgrp_attach() and updates it to walk all fds of all tasks in the target css so that it can be used from both migration and config change paths. The latter drops @css from cgrp_attach(). Resolve the conflict by making cgrp_attach() call update_classid() with the css from the first task. We can revive @tset walking in cgrp_attach() but given that net_cls is v1 only where there always is only one target css during migration, this is fine. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Nina Schiff <ninasc@fb.com>		2015-12-07 10:09:03 -05: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	…
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	atm: deal with setting entry before mkip was called	2015-09-17 22:13:32 -07:00
ax25	NET: AX.25: Stop heartbeat timer on disconnect.	2015-07-15 15:59:58 -07:00
batman-adv	batman-adv: turn batadv_neigh_node_get() into local function	2015-08-27 20:15:34 +02:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2015-12-03 12:04:05 -05:00
bridge	switchdev: bridge: Check return code is not EOPNOTSUPP	2015-11-16 14:56:03 -05: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	Merge branch 'master' into for-4.4-fixes	2015-12-07 10:09:03 -05:00
dcb	net/dcb: make dcbnl.c explicitly non-modular	2015-10-09 07:52:27 -07:00
dccp	ipv6: kill sk_dst_lock	2015-12-03 11:32:06 -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: use switchdev obj for VLAN add/del ops	2015-11-01 15:56:11 -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	ipv4: igmp: Allow removing groups from a removed interface	2015-12-03 12:07:05 -05:00
ipv6	ipv6: kill sk_dst_lock	2015-12-03 11:32:06 -05: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	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
key	af_key: fix two typos	2015-10-23 03:05:19 -07:00
l2tp	ipv6: add complete rcu protection around np->opt	2015-12-02 23:37:16 -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: fix off-channel mgmt-tx uninitialized variable usage	2015-12-02 22:27:53 +01:00
mac802154	mac802154: llsec: use kzfree	2015-10-21 00:49:24 +02:00
mpls	mpls: reduce memory usage of routes	2015-10-27 19:52:59 -07:00
netfilter	ipvs: use skb_to_full_sk() helper	2015-11-15 18:39:48 -05:00
netlabel	…
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	openvswitch: fix hangup on vxlan/gre/geneve device deletion	2015-12-03 14:29:25 -05: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	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
sched	net_sched: fix qdisc_tree_decrease_qlen() races	2015-12-03 14:59:05 -05:00
sctp	ipv6: sctp: implement sctp_v6_destroy_sock()	2015-12-03 12:05:57 -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	tipc: fix error handling of expanding buffer headroom	2015-11-24 11:26:19 -05:00
unix	net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA	2015-12-01 15:45:05 -05:00
vmw_vsock	VSOCK: call sk->sk_data_ready() on accept()	2015-11-04 22:03:10 -05:00
wimax	net:wimax: Fix doucble word "the the" in networking.xml	2015-08-09 22:43:52 -07:00
wireless	cfg80211: allow AID/listen interval changes for unassociated station	2015-11-03 11:20:29 +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
Kconfig	net: Introduce L3 Master device abstraction	2015-09-29 20:40:32 -07:00
Makefile	net: Introduce L3 Master device abstraction	2015-09-29 20:40:32 -07:00
compat.c	…
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