Messages in this thread |  | | Date | Fri, 14 Feb 2014 15:25:57 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the cgroup tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in kernel/cpuset.c between commit d66393e54e0a ("cpuset: use css_task_iter_start/next/end() instead of css_scan_tasks()") from the cgroup tree and commit a82211b06d6e ("cpusets: allocate heap only when required") from the akpm-current tree.
I fixed it up (the former removed the need for the heap, so I effectively remove the latter) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |