Merge branch 'linus' into core/rcu, to fix up a semantic conflict (e4340bbb) · Commits · 戴 / test

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>
		James Ketrenos <jketreno@io.(none)>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jean Tourrilhes <jt@hpl.hp.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		Jens Axboe <axboe@suse.de>

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		This file contains documentation for running mainline
		kernel on omaps.

		KERNEL NEW DEPENDENCIES
		v4.3+ Update is needed for custom .config files to make sure
		CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work
		properly.

+4 −3

Original line number	Diff line number	Diff line
		@@ -894,11 +894,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained

		ARM/Allwinner A1X SoC support
		ARM/Allwinner sunXi SoC support
		M: Maxime Ripard <maxime.ripard@free-electrons.com>
		M: Chen-Yu Tsai <wens@csie.org>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		N: sun[x4567]i
		N: sun[x456789]i

		ARM/Allwinner SoC Clock Support
		M: Emilio López <emilio@elopez.com.ar>
		@@ -6793,7 +6794,6 @@ F: drivers/scsi/megaraid/

		MELLANOX ETHERNET DRIVER (mlx4_en)
		M: Amir Vadai <amirv@mellanox.com>
		M: Ido Shamay <idos@mellanox.com>
		L: netdev@vger.kernel.org
		S: Supported
		W: http://www.mellanox.com
		@@ -11675,6 +11675,7 @@ F: drivers/tty/serial/zs.*
		ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
		M: Minchan Kim <minchan@kernel.org>
		M: Nitin Gupta <ngupta@vflare.org>
		R: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/zsmalloc.c

+1 −1

+1 −0

Original line number	Diff line number	Diff line
		@@ -645,6 +645,7 @@ config ARCH_SHMOBILE_LEGACY

		config ARCH_RPC
		bool "RiscPC"
		depends on MMU
		select ARCH_ACORN
		select ARCH_MAY_HAVE_PC_FDC
		select ARCH_SPARSEMEM_ENABLE