diff options
| author | Tejun Heo <[email protected]> | 2015-12-07 15:09:03 +0000 |
|---|---|---|
| committer | Tejun Heo <[email protected]> | 2015-12-07 15:09:03 +0000 |
| commit | 0b98f0c04245877ae0b625a7f0aa55b8ff98e0c4 (patch) | |
| tree | 486ebe0d76217a4f7781e28fbd96facb0b66f9da /drivers/gpu/drm/omapdrm/omap_fbdev.c | |
| parent | cgroup_pids: don't account for the root cgroup (diff) | |
| parent | Linux 4.4-rc4 (diff) | |
| download | kernel-0b98f0c04245877ae0b625a7f0aa55b8ff98e0c4.tar.gz kernel-0b98f0c04245877ae0b625a7f0aa55b8ff98e0c4.zip | |
Merge branch 'master' into for-4.4-fixes
The following commit which went into mainline through networking tree
3b13758f51de ("cgroups: Allow dynamically changing net_classid")
conflicts in net/core/netclassid_cgroup.c with the following pending
fix in cgroup/for-4.4-fixes.
1f7dd3e5a6e4 ("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 <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Cc: Nina Schiff <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fbdev.c')
0 files changed, 0 insertions, 0 deletions