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

[Stephen Rothwell]

Hi all,

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

  lib/Makefile

between commit:

  463f74089ff9 ("crypto: lib - move lib/sha1.c into lib/crypto/")

from the crypto tree and commit:

  058c2f0f755f ("Maple Tree: add new data structure")

from the mm 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 lib/Makefile
index 17e48da223e2,dd5cf8f36eaa..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -29,7 -29,8 +29,7 @@@ endi
  
  lib-y := ctype.o string.o vsprintf.o cmdline.o \
  	 rbtree.o radix-tree.o timerqueue.o xarray.o \
- 	 idr.o extable.o irq_regs.o argv_split.o \
 -	 maple_tree.o idr.o extable.o \
 -	 sha1.o irq_regs.o argv_split.o \
++	 maple_tree.o idr.o extable.o irq_regs.o argv_split.o \
  	 flex_proportions.o ratelimit.o show_mem.o \
  	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
  	 earlycpio.o seq_buf.o siphash.o dec_and_lock.o \

Attachment: pgpjnNiulgokR.pgp
Description: OpenPGP digital signature