linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shuah Khan <skhan@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Kees Cook <keescook@chromium.org>, Shuah Khan <shuah@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the seccomp tree with the kselftest tree
Date: Wed, 5 Aug 2020 16:24:04 -0600	[thread overview]
Message-ID: <0300764c-a9cf-bdef-57aa-afc0e59d8c17@linuxfoundation.org> (raw)
In-Reply-To: <20200805154511.698d76d0@canb.auug.org.au>

On 8/4/20 11:45 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 20 Jul 2020 15:59:17 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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:
>>
>>    4c6614dc86ad ("selftests/seccomp: Check ENOSYS under tracing")
>>
>> from the kselftest tree and commit:
>>
>>    11eb004ef7ea ("selftests/seccomp: Check ENOSYS under tracing")
>>
>> from the seccomp tree.
>>
>> I fixed it up (I just used the latter version) 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.
> 
> This is now a conflict between the kselftest tree and Linus' tree.
> 

This is sorted out. I added a note to my pull request.

thanks,
-- Shuah

  reply	other threads:[~2020-08-05 22:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-20  5:59 linux-next: manual merge of the seccomp tree with the kselftest tree Stephen Rothwell
2020-08-05  5:45 ` Stephen Rothwell
2020-08-05 22:24   ` Shuah Khan [this message]
2020-08-05 22:27     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-07-07  4:57 Stephen Rothwell
2020-07-07  8:26 ` Kees Cook
2020-07-07 19:27   ` Shuah Khan
2020-07-08  2:00     ` Kees Cook

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=0300764c-a9cf-bdef-57aa-afc0e59d8c17@linuxfoundation.org \
    --to=skhan@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shuah@kernel.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).