Hi all,
Today's linux-next merge of the slab tree got a conflict in:
lib/fortify_kunit.c
between commit:
99a6087dfdc6 ("kunit/fortify: Remove __kmalloc_node() test")
from Linus' tree and commit:
a0a44d9175b3 ("mm, slab: don't wrap internal functions with alloc_hooks()")
from the slab tree.
I fixed it up (the latter includes the former, so I just used the latter)
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.
--
Cheers,
Stephen Rothwell