Hi Mark,
On Mon, 9 Oct 2017 19:38:36 +0100 Mark Brown <broonie@xxxxxxxxxx> 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:
>
> 041cd640b2f3c ("cgroup: Implement cgroup2 basic CPU usage accounting")
>
> from the cgroup tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc kernel/cgroup/cgroup.c
> index 00f5b358aeac,c3421ee0d230..000000000000
> --- a/kernel/cgroup/cgroup.c
> +++ b/kernel/cgroup/cgroup.c
> @@@ -4765,8 -4785,9 +4788,11 @@@ static struct cgroup *cgroup_create(str
>
> return cgrp;
>
> +out_idr_free:
> + cgroup_idr_remove(&root->cgroup_idr, cgrp->id);
> + out_stat_exit:
> + if (cgroup_on_dfl(parent))
> + cgroup_stat_exit(cgrp);
> out_cancel_ref:
> percpu_ref_exit(&cgrp->self.refcnt);
> out_free_cgrp:
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
--
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
