From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760215AbbBIJbq (ORCPT ); Mon, 9 Feb 2015 04:31:46 -0500 Received: from ozlabs.org ([103.22.144.67]:33401 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759665AbbBIJbo (ORCPT ); Mon, 9 Feb 2015 04:31:44 -0500 Date: Mon, 9 Feb 2015 20:31:37 +1100 From: Stephen Rothwell To: Andrew Morton , David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Andrey Ryabinin , Geert Uytterhoeven , Al Viro Subject: linux-next: manual merge of the akpm-current tree with the net-next tree Message-ID: <20150209203137.798bede8@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_//9ZvTbS6.fccI5fqQGsl++H"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_//9ZvTbS6.fccI5fqQGsl++H Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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). --=20 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 +=3D kobject.o klist. obj-y +=3D lockref.o =20 obj-y +=3D 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 +=3D string_helpers.o @@@ -35,7 -37,7 +37,8 @@@ obj-$(CONFIG_TEST_LKM) +=3D test_module. obj-$(CONFIG_TEST_USER_COPY) +=3D test_user_copy.o obj-$(CONFIG_TEST_BPF) +=3D test_bpf.o obj-$(CONFIG_TEST_FIRMWARE) +=3D test_firmware.o +obj-$(CONFIG_TEST_RHASHTABLE) +=3D test_rhashtable.o + obj-$(CONFIG_TEST_KASAN) +=3D test_kasan.o =20 ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o +=3D -DDEBUG --Sig_//9ZvTbS6.fccI5fqQGsl++H Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJU2H59AAoJEMDTa8Ir7ZwVhTMQAJMmn7DV2cLEb6X2dkPZZx5R J6Z2cGFzPmDm/pl69YS7Iks6jLZhHqAgugRYE04YpBu6Jjhr62AF6UAMaH4N2ApI Tp/QDoI9PJJh7y/C6QKs542ppF8fA8qflbO6PGORMYbSKqwQYdmwU18ThaLTJavH RA6vM30XzEOj1Pm44fo+gp0OaRAHUFUSmcA76yEsiEba17w3wKvyvwi4Ni530XFE FuzY/yzx7FU+jUEBwELuos2w5j0MxBAQEfJhwkCFUXgcA4MrvsxviPlo2Mksgdo6 sOFrMOQ6FDFKPHFeUrqEVJEAfzYefveFJNfCeVDGmphst/yot65TvDD/oQK0GTSB WyQhiJuypxL9e39b4W9YAMLlsh4CYcQmuHdfwk2MA6NKf3jBCLVlDq/iEMTnKPHH wV/vM75GfgMrrRjEenLoxKjZBcUGt21qzPRvSzAQjudK8qPnXTr84cS1SBOaVR6A CyztLOfFv/WQ6TV5u4XNoAKoRQHfKoudqtPueJvD38ISSoEtlZF2Uzm29Uu+hqCu SXUIxdHQH4E+57GZyp8zqz7oqVV6uxeRj+iBXoucDwAMBS23mYlHkR3C0+varg5N bh5OT+m9kCBQx2e6RutZm7+0mYQJC2+IkOtLfAlMAtVXmTBjMWO4RLACkkqL3Gmz uxR+8M/0dmBPOqA3E3JA =4cpk -----END PGP SIGNATURE----- --Sig_//9ZvTbS6.fccI5fqQGsl++H-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the akpm-current tree with the net-next tree Date: Mon, 9 Feb 2015 20:31:37 +1100 Message-ID: <20150209203137.798bede8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_//9ZvTbS6.fccI5fqQGsl++H"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Andrew Morton , David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Andrey Ryabinin , Geert Uytterhoeven , Al Viro List-Id: linux-next.vger.kernel.org --Sig_//9ZvTbS6.fccI5fqQGsl++H Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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). --=20 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 +=3D kobject.o klist. obj-y +=3D lockref.o =20 obj-y +=3D 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 +=3D string_helpers.o @@@ -35,7 -37,7 +37,8 @@@ obj-$(CONFIG_TEST_LKM) +=3D test_module. obj-$(CONFIG_TEST_USER_COPY) +=3D test_user_copy.o obj-$(CONFIG_TEST_BPF) +=3D test_bpf.o obj-$(CONFIG_TEST_FIRMWARE) +=3D test_firmware.o +obj-$(CONFIG_TEST_RHASHTABLE) +=3D test_rhashtable.o + obj-$(CONFIG_TEST_KASAN) +=3D test_kasan.o =20 ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o +=3D -DDEBUG --Sig_//9ZvTbS6.fccI5fqQGsl++H Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJU2H59AAoJEMDTa8Ir7ZwVhTMQAJMmn7DV2cLEb6X2dkPZZx5R J6Z2cGFzPmDm/pl69YS7Iks6jLZhHqAgugRYE04YpBu6Jjhr62AF6UAMaH4N2ApI Tp/QDoI9PJJh7y/C6QKs542ppF8fA8qflbO6PGORMYbSKqwQYdmwU18ThaLTJavH RA6vM30XzEOj1Pm44fo+gp0OaRAHUFUSmcA76yEsiEba17w3wKvyvwi4Ni530XFE FuzY/yzx7FU+jUEBwELuos2w5j0MxBAQEfJhwkCFUXgcA4MrvsxviPlo2Mksgdo6 sOFrMOQ6FDFKPHFeUrqEVJEAfzYefveFJNfCeVDGmphst/yot65TvDD/oQK0GTSB WyQhiJuypxL9e39b4W9YAMLlsh4CYcQmuHdfwk2MA6NKf3jBCLVlDq/iEMTnKPHH wV/vM75GfgMrrRjEenLoxKjZBcUGt21qzPRvSzAQjudK8qPnXTr84cS1SBOaVR6A CyztLOfFv/WQ6TV5u4XNoAKoRQHfKoudqtPueJvD38ISSoEtlZF2Uzm29Uu+hqCu SXUIxdHQH4E+57GZyp8zqz7oqVV6uxeRj+iBXoucDwAMBS23mYlHkR3C0+varg5N bh5OT+m9kCBQx2e6RutZm7+0mYQJC2+IkOtLfAlMAtVXmTBjMWO4RLACkkqL3Gmz uxR+8M/0dmBPOqA3E3JA =4cpk -----END PGP SIGNATURE----- --Sig_//9ZvTbS6.fccI5fqQGsl++H--