linux-next: manual merge of the rcu tree with the spdx tree

linux-next: manual merge of the rcu tree with the spdx tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/memory-model/litmus-tests/.gitignore
index c492a1ddad91,848e62d2a9b3..000000000000
--- a/tools/memory-model/litmus-tests/.gitignore
+++ b/tools/memory-model/litmus-tests/.gitignore
@@@ -1,2 -1,1 +1,2 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
- *.litmus.out
+ *.litmus.*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the rcu tree with the spdx tree

[Greg KH]

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

Re: linux-next: manual merge of the rcu tree with the spdx tree

[Paul E. McKenney]

On Thu, Mar 26, 2020 at 08:55:50AM +0100, Greg KH wrote:
> 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.

Works for me as well!

							Thanx, Paul