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
