linux-next: manual merge of the akpm-current tree with the net-next tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Andrey Ryabinin <a.ryabinin@samsung.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Al Viro <viro@zeniv.linux.org.uk>
Subject: linux-next: manual merge of the akpm-current tree with the net-next tree
Date: Mon, 9 Feb 2015 20:31:37 +1100	[thread overview]
Message-ID: <20150209203137.798bede8@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
lib/Makefile between commits 9d6dbe1bbaf8 ("rhashtable: Make selftest
modular") and 57dd8a0735aa ("vhost: vhost_scsi_handle_vq() should just
use copy_from_user()") from the net-next tree and commits f3d593d650ec
("hexdump: introduce test suite") and ("lib: add kasan test module")
from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc lib/Makefile
index 25c061f77df7,87e55a1219bd..000000000000

--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -23,8 -23,8 +23,8 @@@ lib-y	+= kobject.o klist.
  obj-y	+= lockref.o
  
  obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
- 	 bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \
+ 	 bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
 -	 gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \
 +	 gcd.o lcm.o list_sort.o uuid.o flex_array.o clz_ctz.o \
  	 bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \
  	 percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
  obj-y += string_helpers.o
@@@ -35,7 -37,7 +37,8 @@@ obj-$(CONFIG_TEST_LKM) += test_module.
  obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o
  obj-$(CONFIG_TEST_BPF) += test_bpf.o
  obj-$(CONFIG_TEST_FIRMWARE) += test_firmware.o
 +obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o
+ obj-$(CONFIG_TEST_KASAN) += test_kasan.o
  
  ifeq ($(CONFIG_DEBUG_KOBJECT),y)
  CFLAGS_kobject.o += -DDEBUG

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
