* linux-next: manual merge of the rcu tree with the spdx tree
@ 2020-03-26 3:12 Stephen Rothwell
2020-03-26 7:55 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-03-26 3:12 UTC (permalink / raw)
To: Paul E. McKenney, Greg KH
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Masahiro Yamada
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the rcu tree with the spdx tree
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
2020-03-26 12:45 ` Paul E. McKenney
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2020-03-26 7:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul E. McKenney, Linux Next Mailing List,
Linux Kernel Mailing List, Masahiro Yamada
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the rcu tree with the spdx tree
2020-03-26 7:55 ` Greg KH
@ 2020-03-26 12:45 ` Paul E. McKenney
0 siblings, 0 replies; 3+ messages in thread
From: Paul E. McKenney @ 2020-03-26 12:45 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Masahiro Yamada
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-26 12:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2020-03-26 12:45 ` Paul E. McKenney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox