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

Hi all, On Mon, 24 Jun 2019 17:52:38 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the cgroup tree got a conflict in: > > Documentation/block/bfq-iosched.txt > > between commit: > > 8060c47ba853 ("block: rename CONFIG_DEBUG_BLK_CGROUP to > CONFIG_BFQ_CGROUP_DEBUG") > > f

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

Hi all, Today's linux-next merge of the cgroup tree got a conflict in: Documentation/block/bfq-iosched.txt between commit: 8060c47ba853 ("block: rename CONFIG_DEBUG_BLK_CGROUP to CONFIG_BFQ_CGROUP_DEBUG") from the block tree and commit: 99c8b231ae6c ("docs: cgroup-v1: convert docs to R