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'

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

Hi all, 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' tree and commit: 99c8b231ae6c ("docs: cgroup-v1: convert docs to ReST and

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

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

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

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: net/core/netclassid_cgroup.c between commit: 3b13758f51de ("cgroups: Allow dynamically changing net_classid") from Linus' tree and commit: 1f7dd3e5a6e4 ("cgroup: fix handling of multi-destination migration from

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: net/core/netclassid_cgroup.c between commit: 3b13758f51de ("cgroups: Allow dynamically changing net_classid") from Linus' tree and commit: 1f7dd3e5a6e4 ("cgroup: fix handling of multi-destination migration from

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in mm/memcontrol.c between commit 6f6acb00514c ("memcg: fix swapcache charge from kernel thread context") from Linus' tree and commit ec903c0c858e ("cgroup: rename css_tryget*() to css_tryget_online*()") from the cgroup tree. I

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in mm/memcontrol.c between commit 6f6acb00514c (memcg: fix swapcache charge from kernel thread context) from Linus' tree and commit ec903c0c858e (cgroup: rename css_tryget*() to css_tryget_online*()) from the cgroup tree. I

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in include/linux/res_counter.h between commit ebf47beb660e ("include/linux/res_counter.h needs errno.h") from Linus' tree and commit 9259826ccb81 ("res_counter: remove include of cgroup.h from res_counter.h") from the cgroup

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in include/linux/res_counter.h between commit ebf47beb660e (include/linux/res_counter.h needs errno.h) from Linus' tree and commit 9259826ccb81 (res_counter: remove include of cgroup.h from res_counter.h) from the cgroup tree.