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
