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

Hi all, On Mon, 17 Jun 2019 16:06:35 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the cgroup tree got a conflict in: > > Documentation/cgroup-v1/blkio-controller.rst > > between commit: > > fb5772cbfe48 ("blkio-controller.txt: Remove references to CFQ") > > from Linus' t

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

Hi Tejun, On Mon, 7 Dec 2015 10:20:32 -0500 Tejun Heo wrote: > > Resolved from cgroup/for-4.4-fixes side. Excellent, thanks! -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message

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

Hello, Resolved from cgroup/for-4.4-fixes side. Thanks. -- 8< -- commit 0b98f0c04245877ae0b625a7f0aa55b8ff98e0c4 Merge: 67cde9c 527e931 Author: Tejun Heo Date: Mon Dec 7 10:09:03 2015 -0500 Merge branch 'master' into for-4.4-fixes The following commit which went into mai