Resend,24/33 Staging: Wilc1000: Remove Multiple Define For Mac
Resend 24/33 Staging: Wilc1000: Remove Multiple Define For Mac Pro
The following commit which went into mainline through networking tree 3b13758f51de ('cgroups: Allow dynamically changing netclassid') conflicts in net/core/netclassidcgroup.c with the following pending fix in cgroup/for-4.4-fixes. 1f7dd3e5a6e4 ('cgroup: fix handling of multi-destination migration from subtreecontrol enabling') The former separates out updateclassid from cgrpattach 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 cgrpattach.
Resolve the conflict by making cgrpattach call updateclassid with the css from the first task. We can revive @tset walking in cgrpattach but given that netcls is v1 only where there always is only one target css during migration, this is fine. Signed-off-by: Tejun Heo Reported-by: Stephen Rothwell Cc: Nina Schiff.