On Wed, Mar 07, 2012 at 04:05:16PM +1100, Stephen Rothwell wrote: > Hi Tejun, > > Today's linux-next merge of the cgroup tree got a conflict in > block/blk-cgroup.c between commit 7ee9c5620504 ("blkcg: let blkio_group > point to blkio_cgroup directly") from the block tree and commit > 761b3ef50e1c ("cgroup: remove cgroup_subsys argument from callbacks") > from the cgroup tree. > > I fixed it up (I hope - see below) and can carry the fix as necessary. Yeap, looks correct to me. Thank you very much. -- tejun -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html