Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (c749fa18) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+26 −6

Original line number	Diff line number	Diff line
		@@ -1373,7 +1373,8 @@ F: arch/arm/mach-ebsa110/
		F: drivers/net/ethernet/amd/am79c961a.*

		ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
		M: Uwe Kleine-König <kernel@pengutronix.de>
		M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
		R: Pengutronix Kernel Team <kernel@pengutronix.de>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		N: efm32
		@@ -1401,7 +1402,8 @@ F: arch/arm/mach-footbridge/

		ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
		M: Shawn Guo <shawnguo@kernel.org>
		M: Sascha Hauer <kernel@pengutronix.de>
		M: Sascha Hauer <s.hauer@pengutronix.de>
		R: Pengutronix Kernel Team <kernel@pengutronix.de>
		R: Fabio Estevam <fabio.estevam@nxp.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		@@ -1416,7 +1418,8 @@ F: include/soc/imx/

		ARM/FREESCALE VYBRID ARM ARCHITECTURE
		M: Shawn Guo <shawnguo@kernel.org>
		M: Sascha Hauer <kernel@pengutronix.de>
		M: Sascha Hauer <s.hauer@pengutronix.de>
		R: Pengutronix Kernel Team <kernel@pengutronix.de>
		R: Stefan Agner <stefan@agner.ch>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		@@ -4245,6 +4248,9 @@ F: include/trace/events/fs_dax.h

		DEVICE DIRECT ACCESS (DAX)
		M: Dan Williams <dan.j.williams@intel.com>
		M: Dave Jiang <dave.jiang@intel.com>
		M: Ross Zwisler <ross.zwisler@linux.intel.com>
		M: Vishal Verma <vishal.l.verma@intel.com>
		L: linux-nvdimm@lists.01.org
		S: Supported
		F: drivers/dax/
		@@ -5651,7 +5657,8 @@ F: drivers/net/ethernet/freescale/fec.h
		F: Documentation/devicetree/bindings/net/fsl-fec.txt

		FREESCALE IMX / MXC FRAMEBUFFER DRIVER
		M: Sascha Hauer <kernel@pengutronix.de>
		M: Sascha Hauer <s.hauer@pengutronix.de>
		R: Pengutronix Kernel Team <kernel@pengutronix.de>
		L: linux-fbdev@vger.kernel.org
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		@@ -6263,7 +6270,7 @@ S: Odd Fixes
		F: drivers/media/usb/hdpvr/

		HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
		M: Jimmy Vance <jimmy.vance@hpe.com>
		M: Jerry Hoemann <jerry.hoemann@hpe.com>
		S: Supported
		F: Documentation/watchdog/hpwdt.txt
		F: drivers/watchdog/hpwdt.c
		@@ -8055,6 +8062,9 @@ F: tools/lib/lockdep/

		LIBNVDIMM BLK: MMIO-APERTURE DRIVER
		M: Ross Zwisler <ross.zwisler@linux.intel.com>
		M: Dan Williams <dan.j.williams@intel.com>
		M: Vishal Verma <vishal.l.verma@intel.com>
		M: Dave Jiang <dave.jiang@intel.com>
		L: linux-nvdimm@lists.01.org
		Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
		S: Supported
		@@ -8063,6 +8073,9 @@ F: drivers/nvdimm/region_devs.c

		LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
		M: Vishal Verma <vishal.l.verma@intel.com>
		M: Dan Williams <dan.j.williams@intel.com>
		M: Ross Zwisler <ross.zwisler@linux.intel.com>
		M: Dave Jiang <dave.jiang@intel.com>
		L: linux-nvdimm@lists.01.org
		Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
		S: Supported
		@@ -8070,6 +8083,9 @@ F: drivers/nvdimm/btt*

		LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
		M: Ross Zwisler <ross.zwisler@linux.intel.com>
		M: Dan Williams <dan.j.williams@intel.com>
		M: Vishal Verma <vishal.l.verma@intel.com>
		M: Dave Jiang <dave.jiang@intel.com>
		L: linux-nvdimm@lists.01.org
		Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
		S: Supported
		@@ -8085,6 +8101,9 @@ F: Documentation/devicetree/bindings/pmem/pmem-region.txt

		LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
		M: Dan Williams <dan.j.williams@intel.com>
		M: Ross Zwisler <ross.zwisler@linux.intel.com>
		M: Vishal Verma <vishal.l.verma@intel.com>
		M: Dave Jiang <dave.jiang@intel.com>
		L: linux-nvdimm@lists.01.org
		Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
		@@ -12824,7 +12843,8 @@ F: include/linux/siphash.h

		SIOX
		M: Gavin Schenk <g.schenk@eckelmann.de>
		M: Uwe Kleine-König <kernel@pengutronix.de>
		M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
		R: Pengutronix Kernel Team <kernel@pengutronix.de>
		S: Supported
		F: drivers/siox/*
		F: include/trace/events/siox.h

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 4
		PATCHLEVEL = 17
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Fearless Coyote

		# DOCUMENTATION

arch/arm64/kernel/traps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -366,7 +366,7 @@ void force_signal_inject(int signal, int code, unsigned long address)
		}

		/* Force signals we don't understand to SIGKILL */
		if (WARN_ON(signal != SIGKILL \|\|
		if (WARN_ON(signal != SIGKILL &&
		siginfo_layout(signal, code) != SIL_FAULT)) {
		signal = SIGKILL;
		}

arch/arm64/mm/kasan_init.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ void __init kasan_init(void)
		clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);

		kasan_map_populate(kimg_shadow_start, kimg_shadow_end,
		pfn_to_nid(virt_to_pfn(lm_alias(_text))));
		early_pfn_to_nid(virt_to_pfn(lm_alias(_text))));

		kasan_populate_zero_shadow((void *)KASAN_SHADOW_START,
		(void *)mod_shadow_start);
		@@ -224,7 +224,7 @@ void __init kasan_init(void)

		kasan_map_populate((unsigned long)kasan_mem_to_shadow(start),
		(unsigned long)kasan_mem_to_shadow(end),
		pfn_to_nid(virt_to_pfn(start)));
		early_pfn_to_nid(virt_to_pfn(start)));
		}

		/*

arch/powerpc/platforms/cell/spufs/sched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1093,7 +1093,7 @@ static int show_spu_loadavg(struct seq_file s, void private)
		LOAD_INT(c), LOAD_FRAC(c),
		count_active_contexts(),
		atomic_read(&nr_spu_contexts),
		idr_get_cursor(&task_active_pid_ns(current)->idr));
		idr_get_cursor(&task_active_pid_ns(current)->idr) - 1);
		return 0;
		}