lkml.org 
[lkml]   [2019]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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

\
 
 \ /
  Last update: 2019-05-22 07:53    [W:0.073 / U:16.512 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site