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

Hi Mark, On Mon, 9 Oct 2017 19:38:36 +0100 Mark Brown wrote: > > Hi Tejun, > > Today's linux-next merge of the cgroup tree got a conflict in: > > kernel/cgroup/cgroup.c > > between commit: > > 324bda9e6c5ad ("bpf: multi program support for cgroup+bpf") > > from the

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

Hi Mark, On Mon, 9 Oct 2017 19:38:36 +0100 Mark Brown wrote: > > Hi Tejun, > > Today's linux-next merge of the cgroup tree got a conflict in: > > kernel/cgroup/cgroup.c > > between commit: > > 324bda9e6c5ad ("bpf: multi program support for cgroup+bpf") > > from the net-next tree and

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

On Mon, Oct 09, 2017 at 07:38:36PM +0100, Mark Brown wrote: > Hi Tejun, > > Today's linux-next merge of the cgroup tree got a conflict in: > > kernel/cgroup/cgroup.c > > between commit: > > 324bda9e6c5ad ("bpf: multi program support for cgroup+bpf") > > from the net-next tree and commit:

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

On Mon, Oct 09, 2017 at 07:38:36PM +0100, Mark Brown wrote: > Hi Tejun, > > Today's linux-next merge of the cgroup tree got a conflict in: > > kernel/cgroup/cgroup.c > > between commit: > > 324bda9e6c5ad ("bpf: multi program support for cgroup+bpf") > > from the net-next tree and commit:

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: kernel/cgroup/cgroup.c between commit: 324bda9e6c5ad ("bpf: multi program support for cgroup+bpf") from the net-next tree and commit: 041cd640b2f3c ("cgroup: Implement cgroup2 basic CPU usage accounting") from

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: kernel/cgroup/cgroup.c between commit: 324bda9e6c5ad ("bpf: multi program support for cgroup+bpf") from the net-next tree and commit: 041cd640b2f3c ("cgroup: Implement cgroup2 basic CPU usage accounting") from

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: kernel/cgroup.c between commit: 1f3fe7ebf613 ("cgroup: Add cgroup_get_from_fd") from the net-next tree and commit: 55094f575358 ("cgroup: remove duplicated include from cgroup.c") from the cgroup tree. I fixed

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: kernel/cgroup.c between commit: 1f3fe7ebf613 ("cgroup: Add cgroup_get_from_fd") from the net-next tree and commit: 55094f575358 ("cgroup: remove duplicated include from cgroup.c") from the cgroup tree. I fixed

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: include/linux/cgroup.h kernel/cgroup.c between commit: bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup") from the net-next tree and commit: f176ae3a5df6 ("cgroup: introduce cgroup namespaces") from the cgroup

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in: include/linux/cgroup.h kernel/cgroup.c between commit: bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup") from the net-next tree and commit: f176ae3a5df6 ("cgroup: introduce cgroup namespaces") from the cgroup

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in include/net/netprio_cgroup.h between commit 378307217ed9 ("cls_cgroup.h netprio_cgroup.h: Remove extern from function prototypes") from the net-next tree and commit 6d37b97428d2 ("netprio_cgroup: pass around @css instead of

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in include/net/netprio_cgroup.h between commit 378307217ed9 (cls_cgroup.h netprio_cgroup.h: Remove extern from function prototypes) from the net-next tree and commit 6d37b97428d2 (netprio_cgroup: pass around @css instead of

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in net/sched/cls_cgroup.c between commit 6a328d8c6f03 ("cgroup: net_cls: Rework update socket logic") from the net-next tree and commits 92fb97487a7e ("cgroup: rename ->create/post_create/pre_destroy/destroy() to

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

Hi Tejun, Today's linux-next merge of the cgroup tree got a conflict in net/sched/cls_cgroup.c between commit 6a328d8c6f03 (cgroup: net_cls: Rework update socket logic) from the net-next tree and commits 92fb97487a7e (cgroup: rename -create/post_create/pre_destroy/destroy() to