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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200326075550.GB957772@kroah.com>
Date:   Thu, 26 Mar 2020 08:55:50 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Paul E. McKenney" <paulmck@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Subject: Re: linux-next: manual merge of the rcu tree with the spdx tree

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