linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Shuah Khan <shuah@kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Christian Brauner <christian.brauner@ubuntu.com>
Subject: Re: linux-next: manual merge of the seccomp tree with the kselftest tree
Date: Tue, 7 Jul 2020 19:00:15 -0700	[thread overview]
Message-ID: <202007071858.C097D869BB@keescook> (raw)
In-Reply-To: <18b266d0-a116-7201-6cd8-6e11f809e753@linuxfoundation.org>

On Tue, Jul 07, 2020 at 01:27:59PM -0600, Shuah Khan wrote:
> On 7/7/20 2:26 AM, Kees Cook wrote:
> > On Tue, Jul 07, 2020 at 02:57:20PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the seccomp tree got a conflict in:
> > > 
> > >    tools/testing/selftests/seccomp/seccomp_bpf.c
> > > 
> > > between commit:
> > > 
> > >    9847d24af95c ("selftests/harness: Refactor XFAIL into SKIP")
> > > 
> > > from the kselftest tree and commits:
> > > 
> > >    aae7d264d68b ("selftests/seccomp: Check for EPOLLHUP for user_notif")
> > >    11b4beaa0d31 ("selftests/seccomp: Make kcmp() less required")
> > >    ef332c970dfa ("selftests/seccomp: Rename user_trap_syscall() to user_notif_syscall()")
> > > 
> > > from the seccomp tree.
> > 
> > Har har -- a collision of my own creation. Yay lots of trees. ;) I'll
> > make this go away; the cause is a harmless cleanup.
> > 
> 
> Thanks Kees. Let me know if I have to do anything.

Yeah, as it turns out, I could only minimize the conflict, and I think
I'll just mention it when I send the seccomp pull request for the v5.9
merge window.

Thanks!

-- 
Kees Cook

  reply	other threads:[~2020-07-08  2:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-07  4:57 linux-next: manual merge of the seccomp tree with the kselftest tree Stephen Rothwell
2020-07-07  8:26 ` Kees Cook
2020-07-07 19:27   ` Shuah Khan
2020-07-08  2:00     ` Kees Cook [this message]
2020-07-20  5:59 Stephen Rothwell
2020-08-05  5:45 ` Stephen Rothwell
2020-08-05 22:24   ` Shuah Khan
2020-08-05 22:27     ` 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=202007071858.C097D869BB@keescook \
    --to=keescook@chromium.org \
    --cc=christian.brauner@ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shuah@kernel.org \
    --cc=skhan@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).