[lkml]   [2014]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-02-14 06:01    [W:0.022 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site