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
..
auto_group.c
auto_group.h
clock.c
completion.c
core.c	Merge branch 'master' into for-4.4-fixes	2015-12-07 10:09:03 -05:00
cpuacct.c
cpuacct.h
cpudeadline.c
cpudeadline.h
cpupri.c
cpupri.h
cputime.c	sched/cputime: Fix invalid gtime in proc	2015-12-04 10:18:49 +01:00
deadline.c
debug.c
fair.c
features.h
idle_task.c
idle.c
loadavg.c
Makefile
rt.c
sched.h	sched/core: Better document the try_to_wake_up() barriers	2015-12-04 10:26:42 +01:00
stats.c
stats.h
stop_task.c
wait.c