linux-next: manual merge of the akpm tree with the cgroup tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpme tree got conflicts in several files
between commits from the cgroup  tree and commit "cgroups: add previous
cgroup in can_attach_task/attach_task callbacks" from the akpm tree.

This got a bit to hard to resolve, so I dropped that patch and the
following from the akpm tree.

cgroups: new cancel_attach_task() subsystem callback
cgroups: ability to stop res charge propagation on bounded ancestor
cgroups: add res counter common ancestor searching
res_counter: allow charge failure pointer to be null
cgroups: pull up res counter charge failure interpretation to caller
cgroups: allow subsystems to cancel a fork
cgroups: add a task counter subsystem
cgroups: ERR_PTR needs err.h
cgroup: Fix task counter common ancestor logic
cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes

I am wondering if that patch set should be included in the cgroup tree?
Alternatively, you could provide me with a new set of patches based on
today's linux-next.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature