From: ebiederm@xmission•com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Song Liu <songliubraving@fb•com>
Subject: Re: linux-next: manual merge of the userns tree with the bpf-next tree
Date: Thu, 26 Nov 2020 07:41:12 -0600 [thread overview]
Message-ID: <87a6v4nslj.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <20201126162248.7e7963fe@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 26 Nov 2020 16:22:48 +1100")
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> kernel/bpf/task_iter.c
>
> between commit:
>
> 91b2db27d3ff ("bpf: Simplify task_file_seq_get_next()")
>
> from the bpf-next tree and commit:
>
> edc52f17257a ("bpf/task_iter: In task_file_seq_get_next use task_lookup_next_fd_rcu")
>
> from the userns tree.
>
> I fixed it up (I think, 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.
Thanks. Reading through the diff that looks right, and it has been already
reported.
Eric
next prev parent reply other threads:[~2020-11-26 14:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 5:22 linux-next: manual merge of the userns tree with the bpf-next tree Stephen Rothwell
2020-11-26 13:41 ` Eric W. Biederman [this message]
2020-12-14 20:04 ` 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=87a6v4nslj.fsf@x220.int.ebiederm.org \
--to=ebiederm@xmission$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=songliubraving@fb$(echo .)com \
/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