From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
netdev@vger•kernel.org
Cc: Mark Brown <broonie@kernel•org>,
Alexei Starovoitov <ast@kernel•org>,
Daniel Borkmann <daniel@iogearbox•net>,
Martin KaFai Lau <kafai@fb•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the cgroup tree with the net-next tree
Date: Mon, 13 Nov 2017 16:26:28 +1100 [thread overview]
Message-ID: <20171113162618.1b33e82d@canb.auug.org.au> (raw)
In-Reply-To: <20171009183836.cceczuqytzmgqubr@sirena.co.uk>
Hi Mark,
On Mon, 9 Oct 2017 19:38:36 +0100 Mark Brown <broonie@kernel•org> 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
next prev parent reply other threads:[~2017-11-13 5:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 18:38 linux-next: manual merge of the cgroup tree with the net-next tree Mark Brown
2017-10-09 23:04 ` Alexei Starovoitov
2017-11-13 5:26 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-20 6:11 Stephen Rothwell
2015-12-31 8:10 Stephen Rothwell
2013-08-12 2:21 Stephen Rothwell
2012-11-26 4:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171113162618.1b33e82d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ast@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=kafai@fb$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox