From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Paul E. McKenney" <paulmck@kernel•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Masahiro Yamada <masahiroy@kernel•org>
Subject: Re: linux-next: manual merge of the rcu tree with the spdx tree
Date: Thu, 26 Mar 2020 08:55:50 +0100 [thread overview]
Message-ID: <20200326075550.GB957772@kroah.com> (raw)
In-Reply-To: <20200326141235.718118af@canb.auug.org.au>
On Thu, Mar 26, 2020 at 02:12:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> tools/memory-model/litmus-tests/.gitignore
>
> between commit:
>
> d198b34f3855 (".gitignore: add SPDX License Identifier")
>
> from the spdx tree and commits:
>
> 5381fb2b70e9 ("tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out")
> dafa02882066 ("tools/memory-model: Keep assembly-language litmus tests")
>
> from the rcu 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.
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2020-03-26 7:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 3:12 linux-next: manual merge of the rcu tree with the spdx tree Stephen Rothwell
2020-03-26 7:55 ` Greg KH [this message]
2020-03-26 12:45 ` Paul E. McKenney
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=20200326075550.GB957772@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=paulmck@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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