linux-kernel - Re: linux-next: manual merge of the staging tree with the kselftest-fixes 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: <20201029052225.GC282324@kroah.com>
Date:   Thu, 29 Oct 2020 06:22:25 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Shuah Khan <shuah@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tommi Rantala <tommi.t.rantala@...ia.com>
Subject: Re: linux-next: manual merge of the staging tree with the
 kselftest-fixes tree

On Thu, Oct 29, 2020 at 01:27:13PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   tools/testing/selftests/android/ion/ipcsocket.c
>   tools/testing/selftests/android/ion/ipcsocket.h
> 
> between commit:
> 
>   08c5d41130e5 ("selftests: android: fix multiple definition of sock_name")
> 
> from the kselftest-fixes tree and commit:
> 
>   e722a295cf49 ("staging: ion: remove from the tree")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the files) 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.

Easy fix, thanks!

greg k-h