Merge 4.8-rc6 into usb-next (fc9104d5) · Commits · EulixOS / Software / Kernel

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org>
	Kenneth W Chen <kenneth.w.chen@intel.com>		Kenneth W Chen <kenneth.w.chen@intel.com>
	Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
	Koushik <raghavendra.koushik@neterion.com>		Koushik <raghavendra.koushik@neterion.com>
			Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
	Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
	Leonid I Ananiev <leonid.i.ananiev@intel.com>		Leonid I Ananiev <leonid.i.ananiev@intel.com>

Documentation/arm/CCN.txt

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events"
	directory provides configuration templates for all documented		directory provides configuration templates for all documented
	events, that can be used with perf tool. For example "xp_valid_flit"		events, that can be used with perf tool. For example "xp_valid_flit"
	is an equivalent of "type=0x8,event=0x4". Other parameters must be		is an equivalent of "type=0x8,event=0x4". Other parameters must be
	explicitly specified. For events originating from device, "node"		explicitly specified.
	defines its index. All crosspoint events require "xp" (index),
	"port" (device port number) and "vc" (virtual channel ID) and
	"dir" (direction). Watchpoints (special "event" value 0xfe) also
	require comparator values ("cmp_l" and "cmp_h") and "mask", being
	index of the comparator mask.

			For events originating from device, "node" defines its index.

			Crosspoint PMU events require "xp" (index), "bus" (bus number)
			and "vc" (virtual channel ID).

			Crosspoint watchpoint-based events (special "event" value 0xfe)
			require "xp" and "vc" as as above plus "port" (device port index),
			"dir" (transmit/receive direction), comparator values ("cmp_l"
			and "cmp_h") and "mask", being index of the comparator mask.
	Masks are defined separately from the event description		Masks are defined separately from the event description
	(due to limited number of the config values) in the "cmp_mask"		(due to limited number of the config values) in the "cmp_mask"
	directory, with first 8 configurable by user and additional		directory, with first 8 configurable by user and additional

Documentation/cpu-freq/cpufreq-stats.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@ Config Main Menu
	Power management options (ACPI, APM) --->		Power management options (ACPI, APM) --->
	CPU Frequency scaling --->		CPU Frequency scaling --->
	[*] CPU Frequency scaling		[*] CPU Frequency scaling
	<*> CPU frequency translation statistics		[*] CPU frequency translation statistics
	[*] CPU frequency translation statistics details		[*] CPU frequency translation statistics details

Documentation/i2c/slave-interface

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,11 @@ If you want to add slave support to the bus driver:

	* Catch the slave interrupts and send appropriate i2c_slave_events to the backend.		* Catch the slave interrupts and send appropriate i2c_slave_events to the backend.

			Note that most hardware supports being master _and_ slave on the same bus. So,
			if you extend a bus driver, please make sure that the driver supports that as
			well. In almost all cases, slave support does not need to disable the master
			functionality.

	Check the i2c-rcar driver as an example.		Check the i2c-rcar driver as an example.

MAINTAINERS

+21 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1624,7 +1624,7 @@ N: rockchip

	ARM/SAMSUNG EXYNOS ARM ARCHITECTURES		ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
	M: Kukjin Kim <kgene@kernel.org>		M: Kukjin Kim <kgene@kernel.org>
	M: Krzysztof Kozlowski <k.kozlowski@samsung.com>		M: Krzysztof Kozlowski <krzk@kernel.org>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)		L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	@@ -1644,7 +1644,6 @@ F: drivers//s3c64xx*
	F: drivers//s5pv210*		F: drivers//s5pv210*
	F: drivers/memory/samsung/*		F: drivers/memory/samsung/*
	F: drivers/soc/samsung/*		F: drivers/soc/samsung/*
	F: drivers/spi/spi-s3c*
	F: Documentation/arm/Samsung/		F: Documentation/arm/Samsung/
	F: Documentation/devicetree/bindings/arm/samsung/		F: Documentation/devicetree/bindings/arm/samsung/
	F: Documentation/devicetree/bindings/sram/samsung-sram.txt		F: Documentation/devicetree/bindings/sram/samsung-sram.txt
	@@ -1832,6 +1831,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
	ARM/UNIPHIER ARCHITECTURE		ARM/UNIPHIER ARCHITECTURE
	M: Masahiro Yamada <yamada.masahiro@socionext.com>		M: Masahiro Yamada <yamada.masahiro@socionext.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
	S: Maintained		S: Maintained
	F: arch/arm/boot/dts/uniphier*		F: arch/arm/boot/dts/uniphier*
	F: arch/arm/include/asm/hardware/cache-uniphier.h		F: arch/arm/include/asm/hardware/cache-uniphier.h
	@@ -7465,7 +7465,8 @@ F: Documentation/devicetree/bindings/sound/max9860.txt
	F: sound/soc/codecs/max9860.*		F: sound/soc/codecs/max9860.*

	MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS		MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
	M: Krzysztof Kozlowski <k.kozlowski@samsung.com>		M: Krzysztof Kozlowski <krzk@kernel.org>
			M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
	L: linux-pm@vger.kernel.org		L: linux-pm@vger.kernel.org
	S: Supported		S: Supported
	F: drivers/power/max14577_charger.c		F: drivers/power/max14577_charger.c
	@@ -7481,7 +7482,8 @@ F: include/dt-bindings//max77802.h

	MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS		MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
	M: Chanwoo Choi <cw00.choi@samsung.com>		M: Chanwoo Choi <cw00.choi@samsung.com>
	M: Krzysztof Kozlowski <k.kozlowski@samsung.com>		M: Krzysztof Kozlowski <krzk@kernel.org>
			M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
	L: linux-kernel@vger.kernel.org		L: linux-kernel@vger.kernel.org
	S: Supported		S: Supported
	F: drivers//max14577.c		F: drivers//max14577.c
	@@ -9247,7 +9249,7 @@ F: drivers/pinctrl/sh-pfc/

	PIN CONTROLLER - SAMSUNG		PIN CONTROLLER - SAMSUNG
	M: Tomasz Figa <tomasz.figa@gmail.com>		M: Tomasz Figa <tomasz.figa@gmail.com>
	M: Krzysztof Kozlowski <k.kozlowski@samsung.com>		M: Krzysztof Kozlowski <krzk@kernel.org>
	M: Sylwester Nawrocki <s.nawrocki@samsung.com>		M: Sylwester Nawrocki <s.nawrocki@samsung.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)		L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
	@@ -10180,7 +10182,7 @@ S: Maintained
	F: drivers/platform/x86/samsung-laptop.c		F: drivers/platform/x86/samsung-laptop.c

	SAMSUNG AUDIO (ASoC) DRIVERS		SAMSUNG AUDIO (ASoC) DRIVERS
	M: Krzysztof Kozlowski <k.kozlowski@samsung.com>		M: Krzysztof Kozlowski <krzk@kernel.org>
	M: Sangbeom Kim <sbkim73@samsung.com>		M: Sangbeom Kim <sbkim73@samsung.com>
	M: Sylwester Nawrocki <s.nawrocki@samsung.com>		M: Sylwester Nawrocki <s.nawrocki@samsung.com>
	L: alsa-devel@alsa-project.org (moderated for non-subscribers)		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	@@ -10195,7 +10197,8 @@ F: drivers/video/fbdev/s3c-fb.c

	SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS		SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
	M: Sangbeom Kim <sbkim73@samsung.com>		M: Sangbeom Kim <sbkim73@samsung.com>
	M: Krzysztof Kozlowski <k.kozlowski@samsung.com>		M: Krzysztof Kozlowski <krzk@kernel.org>
			M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
	L: linux-kernel@vger.kernel.org		L: linux-kernel@vger.kernel.org
	L: linux-samsung-soc@vger.kernel.org		L: linux-samsung-soc@vger.kernel.org
	S: Supported		S: Supported
	@@ -10254,6 +10257,17 @@ S: Supported
	L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)		L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
	F: drivers/clk/samsung/		F: drivers/clk/samsung/

			SAMSUNG SPI DRIVERS
			M: Kukjin Kim <kgene@kernel.org>
			M: Krzysztof Kozlowski <krzk@kernel.org>
			M: Andi Shyti <andi.shyti@samsung.com>
			L: linux-spi@vger.kernel.org
			L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
			S: Maintained
			F: Documentation/devicetree/bindings/spi/spi-samsung.txt
			F: drivers/spi/spi-s3c*
			F: include/linux/platform_data/spi-s3c64xx.h

	SAMSUNG SXGBE DRIVERS		SAMSUNG SXGBE DRIVERS
	M: Byungho An <bh74.an@samsung.com>		M: Byungho An <bh74.an@samsung.com>
	M: Girish K S <ks.giri@samsung.com>		M: Girish K S <ks.giri@samsung.com>