linux-kernel - Re: linux-next: manual merge of the pidfd tree with Linus' 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]

Date:   Wed, 22 May 2019 07:52:35 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Christian Brauner <christian@...uner.io>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        "Joel Fernandes (Google)" <joel@...lfernandes.org>
Subject: Re: linux-next: manual merge of the pidfd tree with Linus' tree

On Wed, May 22, 2019 at 11:01:15AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pidfd tree got a conflict in:
> 
>   tools/testing/selftests/pidfd/Makefile
> 
> between commit:
> 
>   ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
> 
> from Linus' tree and commit:
> 
>   233ad92edbea ("pidfd: add polling selftests")
> 
> from the pidfd tree.

Sorry, you are going to get a number of these types of minor conflicts
now.  That's the problem of touching thousands of files :(

thanks,

greg k-h