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

[Stephen Rothwell]

Hi all,

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

  tools/testing/radix-tree/Makefile

between commit:

  5a198c3f9b0b ("tools: Move gfp.h and slab.h from radix-tree to lib")

from the memblock tree and commits:

  4af8015a7707 ("Maple Tree: Add new data structure")
  f6955b248f29 ("lib/test_maple_tree: Add testing for maple tree")

from the maple tree.

I fixed it up (see below) 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

diff --cc tools/testing/radix-tree/Makefile
index c4ea4fbb0bfc,3e0fa6ae0e0a..000000000000
--- a/tools/testing/radix-tree/Makefile
+++ b/tools/testing/radix-tree/Makefile
@@@ -4,9 -4,8 +4,9 @@@ CFLAGS += -I. -I../../include -g -Og -W
  	  -fsanitize=undefined
  LDFLAGS += -fsanitize=address -fsanitize=undefined
  LDLIBS+= -lpthread -lurcu
- TARGETS = main idr-test multiorder xarray
+ TARGETS = main idr-test multiorder xarray maple
 -CORE_OFILES := xarray.o radix-tree.o idr.o linux.o test.o find_bit.o bitmap.o maple.o
 +CORE_OFILES := xarray.o radix-tree.o idr.o linux.o test.o find_bit.o bitmap.o \
- 			 slab.o
++			 slab.o maple.o
  OFILES = main.o $(CORE_OFILES) regression1.o regression2.o regression3.o \
  	 regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \
  	 iteration_check_2.o benchmark.o

Attachment: pgpGcYuy1JXuI.pgp
Description: OpenPGP digital signature