linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2016-12-12T05:49:55Z

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

lib/radix-tree.c

between commit:

2b41226b39b6 ("Revert "radix tree test suite: fix compilation"")

from Linus' tree and patch:

"reimplement IDR and IDA using the radix tree"

from the akpm tree.

I fixed it up (I added back the include of notifier.h) 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