linux-next: manual merge of the mm-nonmm-stable tree with the bitmap tree

[Stephen Rothwell]

Hi all,

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

  lib/Makefile

between commit:

  e0281efe11c9 ("lib/nodemask: inline next_node_in() and node_random()")

from the bitmap tree and commit:

  b81dce77cedc ("cpumask: Fix invalid uniprocessor mask assumption")

from the mm-nonmm-stable 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 90d02a0986e9,de3e47453fe8..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -33,11 -33,10 +33,10 @@@ lib-y := ctype.o string.o vsprintf.o cm
  	 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 \
 -	 nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o \
 +	 nmi_backtrace.o win_minmax.o memcat_p.o \
- 	 buildid.o
+ 	 buildid.o cpumask.o
  
  lib-$(CONFIG_PRINTK) += dump_stack.o
- lib-$(CONFIG_SMP) += cpumask.o
  
  lib-y	+= kobject.o klist.o
  obj-y	+= lockref.o

Attachment: pgpRdXms7mJ4p.pgp
Description: OpenPGP digital signature