Merge 4.0-rc7 into tty-next (b3e3bf2e) · Commits · jan.koester / Linux

Documentation/devicetree/bindings/net/dsa/dsa.txt

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,9 @@ the parent DSA node. The maximum number of allowed child nodes is 4
	(DSA_MAX_SWITCHES).		(DSA_MAX_SWITCHES).
	Each of these switch child nodes should have the following required properties:		Each of these switch child nodes should have the following required properties:

	- reg : Describes the switch address on the MII bus		- reg : Contains two fields. The first one describes the
			address on the MII bus. The second is the switch
			number that must be unique in cascaded configurations
	- #address-cells : Must be 1		- #address-cells : Must be 1
	- #size-cells : Must be 0		- #size-cells : Must be 0

Documentation/input/alps.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,9 @@ ALPS Absolute Mode - Protocol Version 2
	byte 4: 0 y6 y5 y4 y3 y2 y1 y0		byte 4: 0 y6 y5 y4 y3 y2 y1 y0
	byte 5: 0 z6 z5 z4 z3 z2 z1 z0		byte 5: 0 z6 z5 z4 z3 z2 z1 z0

			Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
			the DualPoint Stick.

	Dualpoint device -- interleaved packet format		Dualpoint device -- interleaved packet format
	---------------------------------------------		---------------------------------------------

	@@ -127,6 +130,11 @@ Dualpoint device -- interleaved packet format
	byte 7: 0 y6 y5 y4 y3 y2 y1 y0		byte 7: 0 y6 y5 y4 y3 y2 y1 y0
	byte 8: 0 z6 z5 z4 z3 z2 z1 z0		byte 8: 0 z6 z5 z4 z3 z2 z1 z0

			Devices which use the interleaving format normally send standard PS/2 mouse
			packets for the DualPoint Stick + ALPS Absolute Mode packets for the
			touchpad, switching to the interleaved packet format when both the stick and
			the touchpad are used at the same time.

	ALPS Absolute Mode - Protocol Version 3		ALPS Absolute Mode - Protocol Version 3
	---------------------------------------		---------------------------------------

Documentation/input/event-codes.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -294,6 +294,12 @@ accordingly. This property does not affect kernel behavior.
	The kernel does not provide button emulation for such devices but treats		The kernel does not provide button emulation for such devices but treats
	them as any other INPUT_PROP_BUTTONPAD device.		them as any other INPUT_PROP_BUTTONPAD device.

			INPUT_PROP_ACCELEROMETER
			-------------------------
			Directional axes on this device (absolute and/or relative x, y, z) represent
			accelerometer data. All other axes retain their meaning. A device must not mix
			regular directional axes and accelerometer axes on the same event node.

	Guidelines:		Guidelines:
	==========		==========
	The guidelines below ensure proper single-touch and multi-finger functionality.		The guidelines below ensure proper single-touch and multi-finger functionality.

Documentation/input/multi-touch-protocol.txt

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -312,9 +312,12 @@ ABS_MT_TOOL_TYPE

	The type of approaching tool. A lot of kernel drivers cannot distinguish		The type of approaching tool. A lot of kernel drivers cannot distinguish
	between different tool types, such as a finger or a pen. In such cases, the		between different tool types, such as a finger or a pen. In such cases, the
	event should be omitted. The protocol currently supports MT_TOOL_FINGER and		event should be omitted. The protocol currently supports MT_TOOL_FINGER,
	MT_TOOL_PEN [2]. For type B devices, this event is handled by input core;		MT_TOOL_PEN, and MT_TOOL_PALM [2]. For type B devices, this event is handled
	drivers should instead use input_mt_report_slot_state().		by input core; drivers should instead use input_mt_report_slot_state().
			A contact's ABS_MT_TOOL_TYPE may change over time while still touching the
			device, because the firmware may not be able to determine which tool is being
			used when it first appears.

	ABS_MT_BLOB_ID		ABS_MT_BLOB_ID

MAINTAINERS

+25 −19

Original line number	Original line	Diff line number	Diff line
	@@ -637,8 +637,7 @@ F: drivers/gpu/drm/radeon/radeon_kfd.h
	F: include/uapi/linux/kfd_ioctl.h		F: include/uapi/linux/kfd_ioctl.h

	AMD MICROCODE UPDATE SUPPORT		AMD MICROCODE UPDATE SUPPORT
	M: Andreas Herrmann <herrmann.der.user@googlemail.com>		M: Borislav Petkov <bp@alien8.de>
	L: amd64-microcode@amd64.org
	S: Maintained		S: Maintained
	F: arch/x86/kernel/cpu/microcode/amd*		F: arch/x86/kernel/cpu/microcode/amd*

	@@ -1186,7 +1185,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: arch/arm/mach-mvebu/		F: arch/arm/mach-mvebu/
	F: drivers/rtc/armada38x-rtc		F: drivers/rtc/rtc-armada38x.c

	ARM/Marvell Berlin SoC support		ARM/Marvell Berlin SoC support
	M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>		M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
	@@ -1362,6 +1361,7 @@ F: drivers/i2c/busses/i2c-rk3x.c
	F: drivers//rockchip*		F: drivers//rockchip*
	F: drivers///rockchip		F: drivers///rockchip
	F: sound/soc/rockchip/		F: sound/soc/rockchip/
			N: rockchip

	ARM/SAMSUNG EXYNOS ARM ARCHITECTURES		ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
	M: Kukjin Kim <kgene@kernel.org>		M: Kukjin Kim <kgene@kernel.org>
	@@ -1675,8 +1675,8 @@ F: drivers/misc/eeprom/at24.c
	F: include/linux/platform_data/at24.h		F: include/linux/platform_data/at24.h

	ATA OVER ETHERNET (AOE) DRIVER		ATA OVER ETHERNET (AOE) DRIVER
	M: "Ed L. Cashin" <ecashin@coraid.com>		M: "Ed L. Cashin" <ed.cashin@acm.org>
	W: http://support.coraid.com/support/linux		W: http://www.openaoe.org/
	S: Supported		S: Supported
	F: Documentation/aoe/		F: Documentation/aoe/
	F: drivers/block/aoe/		F: drivers/block/aoe/
	@@ -3252,6 +3252,13 @@ S: Maintained
	F: Documentation/hwmon/dme1737		F: Documentation/hwmon/dme1737
	F: drivers/hwmon/dme1737.c		F: drivers/hwmon/dme1737.c

			DMI/SMBIOS SUPPORT
			M: Jean Delvare <jdelvare@suse.de>
			S: Maintained
			F: drivers/firmware/dmi-id.c
			F: drivers/firmware/dmi_scan.c
			F: include/linux/dmi.h

	DOCKING STATION DRIVER		DOCKING STATION DRIVER
	M: Shaohua Li <shaohua.li@intel.com>		M: Shaohua Li <shaohua.li@intel.com>
	L: linux-acpi@vger.kernel.org		L: linux-acpi@vger.kernel.org
	@@ -5087,7 +5094,7 @@ S: Supported
	F: drivers/platform/x86/intel_menlow.c		F: drivers/platform/x86/intel_menlow.c

	INTEL IA32 MICROCODE UPDATE SUPPORT		INTEL IA32 MICROCODE UPDATE SUPPORT
	M: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>		M: Borislav Petkov <bp@alien8.de>
	S: Maintained		S: Maintained
	F: arch/x86/kernel/cpu/microcode/core*		F: arch/x86/kernel/cpu/microcode/core*
	F: arch/x86/kernel/cpu/microcode/intel*		F: arch/x86/kernel/cpu/microcode/intel*
	@@ -5128,22 +5135,21 @@ M: Deepak Saxena <dsaxena@plexity.net>
	S: Maintained		S: Maintained
	F: drivers/char/hw_random/ixp4xx-rng.c		F: drivers/char/hw_random/ixp4xx-rng.c

	INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)		INTEL ETHERNET DRIVERS
	M: Jeff Kirsher <jeffrey.t.kirsher@intel.com>		M: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
	M: Jesse Brandeburg <jesse.brandeburg@intel.com>		R: Jesse Brandeburg <jesse.brandeburg@intel.com>
	M: Bruce Allan <bruce.w.allan@intel.com>		R: Shannon Nelson <shannon.nelson@intel.com>
	M: Carolyn Wyborny <carolyn.wyborny@intel.com>		R: Carolyn Wyborny <carolyn.wyborny@intel.com>
	M: Don Skidmore <donald.c.skidmore@intel.com>		R: Don Skidmore <donald.c.skidmore@intel.com>
	M: Greg Rose <gregory.v.rose@intel.com>		R: Matthew Vick <matthew.vick@intel.com>
	M: Matthew Vick <matthew.vick@intel.com>		R: John Ronciak <john.ronciak@intel.com>
	M: John Ronciak <john.ronciak@intel.com>		R: Mitch Williams <mitch.a.williams@intel.com>
	M: Mitch Williams <mitch.a.williams@intel.com>		L: intel-wired-lan@lists.osuosl.org
	M: Linux NICS <linux.nics@intel.com>
	L: e1000-devel@lists.sourceforge.net
	W: http://www.intel.com/support/feedback.htm		W: http://www.intel.com/support/feedback.htm
	W: http://e1000.sourceforge.net/		W: http://e1000.sourceforge.net/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git		Q: http://patchwork.ozlabs.org/project/intel-wired-lan/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
	S: Supported		S: Supported
	F: Documentation/networking/e100.txt		F: Documentation/networking/e100.txt
	F: Documentation/networking/e1000.txt		F: Documentation/networking/e1000.txt