Re: linux-next: manual merge of the cgroup tree with the block tree

From: Tejun Heo
Date: Tue Dec 27 2011 - 12:41:53 EST

Hello, Stephen.

On Mon, Dec 19, 2011 at 10:10 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the cgroup tree got a conflict in
> block/blk-cgroup.c between commit 6e736be7f282 ("block: make ioc get/put
> interface more conventional and fix race on alloction") from the block
> tree and commit bb9d97b6dffa ("cgroup: don't use subsys->can_attach_task
> () or ->attach_task()") from the cgroup tree.
> I guessed about fixing it up (see below) and can carry the fix as
> necessary.

Yes, this looks correct to me. Thank you very much. :)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at