linux-next: manual merge of the memblock tree with the mm tree

[Stephen Rothwell]

Hi all,

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

  tools/testing/shared/linux/init.h

between commit:

  265291d604a6 ("tools: separate out shared radix-tree components")

from the mm-unstable branch of the mm tree and commit:

  f56de2214554 ("tools/testing: abstract two init.h into common include directory")

from the memblock tree.

I fixed it up (I removed the file) 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

Attachment: pgpReo7wcLeDn.pgp
Description: OpenPGP digital signature