Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > block/Kconfig between commit 67523c48aa74d5637848edeccf285af1c60bf14a > ("cgroups: blkio subsystem as module") from Linus' tree and commit > 910ac735bad53ce54741a72a5b19ab69794ae069 ("block: make CONFIG_BLK_CGROUP > visible") from the block tree. > > I used the block tree version. The merge is correct, thanks! -- 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