linux-next: manual merge of the akpm-current tree with the kspp tree
From: Stephen Rothwell
Date: Wed Jul 27 2016 - 02:23:57 EST
Today's linux-next merge of the akpm-current tree got a conflict in:
228d96c603cf ("kbuild: Abort build on bad stack protector flag")
from the kspp tree and commit:
f273155b8dc7 ("kbuild: abort build on bad stack protector flag")
from the akpm-current tree.
I fixed it up (I just arbitrarily used the version from the kspp tree)
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.