Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75d95d84 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/asm, to resolve conflicts 

Conflicts:
	tools/testing/selftests/x86/Makefile
	tools/testing/selftests/x86/run_x86_tests.sh
parents 52648e83 c0655fe9

CREDITS

+7 −0
Original line number Original line Diff line number Diff line
@@ -3709,6 +3709,13 @@ N: Dirk Verworner 
D: Co-author of German book ``Linux-Kernel-Programmierung''

D: Co-author of German book ``Linux-Kernel-Programmierung''

D: Co-founder of Berlin Linux User Group

D: Co-founder of Berlin Linux User Group





N: Andrew Victor

E: linux@maxim.org.za

W: http://maxim.org.za/at91_26.html

D: First maintainer of Atmel ARM-based SoC, aka AT91

D: Introduced support for at91rm9200, the first chip of AT91 family

S: South Africa



N: Riku Voipio

N: Riku Voipio

E: riku.voipio@iki.fi

E: riku.voipio@iki.fi

D: Author of PCA9532 LED and Fintek f75375s hwmon driver

D: Author of PCA9532 LED and Fintek f75375s hwmon driver

Documentation/devicetree/bindings/arm/omap/l3-noc.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ provided by Arteris. 
Required properties:

Required properties:

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

               Should be "ti,omap5-l3-noc" for OMAP5 family

	       Should be "ti,dra7-l3-noc" for DRA7 family

	       Should be "ti,dra7-l3-noc" for DRA7 family

               Should be "ti,am4372-l3-noc" for AM43 family

               Should be "ti,am4372-l3-noc" for AM43 family

- reg:	Contains L3 register address range for each noc domain.

- reg:	Contains L3 register address range for each noc domain.

Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { 
		      80 81 68 69

		      80 81 68 69

		      70 71 72 73

		      70 71 72 73

		      74 75 76 77>;

		      74 75 76 77>;

	interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",

	interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",

			  "saif0", "saif1", "i2c0", "i2c1",

			  "saif0", "saif1", "i2c0", "i2c1",

			  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

			  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

			  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

			  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

Documentation/serial/tty.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -198,6 +198,9 @@ TTY_IO_ERROR If set, causes all subsequent userspace read/write 




TTY_OTHER_CLOSED	Device is a pty and the other side has closed.

TTY_OTHER_CLOSED	Device is a pty and the other side has closed.





TTY_OTHER_DONE		Device is a pty and the other side has closed and

			all pending input processing has been completed.



TTY_NO_WRITE_SPLIT	Prevent driver from splitting up writes into

TTY_NO_WRITE_SPLIT	Prevent driver from splitting up writes into

			smaller chunks.

			smaller chunks.

MAINTAINERS

+47 −21
Original line number Original line Diff line number Diff line
@@ -892,11 +892,10 @@ S: Maintained 
F:	arch/arm/mach-alpine/

F:	arch/arm/mach-alpine/





ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES

ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES

M:	Andrew Victor <linux@maxim.org.za>

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://maxim.org.za/at91_26.html

W:	http://www.linux4sam.org

W:	http://www.linux4sam.org

S:	Supported

S:	Supported

F:	arch/arm/mach-at91/

F:	arch/arm/mach-at91/
@@ -975,7 +974,7 @@ S: Maintained 
ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>

M:	Hans Ulli Kroll <ulli.kroll@googlemail.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.berlios.de/gemini-board

T:	git git://github.com/ulli-kroll/linux.git

S:	Maintained

S:	Maintained

F:	arch/arm/mach-gemini/

F:	arch/arm/mach-gemini/
@@ -990,6 +989,12 @@ F: drivers/clocksource/timer-prima2.c 
F:	drivers/clocksource/timer-atlas7.c

F:	drivers/clocksource/timer-atlas7.c

N:	[^a-z]sirf

N:	[^a-z]sirf





ARM/CONEXANT DIGICOLOR MACHINE SUPPORT

M:	Baruch Siach <baruch@tkos.co.il>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

N:	digicolor



ARM/EBSA110 MACHINE SUPPORT

ARM/EBSA110 MACHINE SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1188,7 +1193,7 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained

S:	Maintained





ARM/Marvell Armada 370 and Armada XP SOC support

ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>

M:	Gregory Clement <gregory.clement@free-electrons.com>
@@ -1197,12 +1202,17 @@ 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/rtc-armada38x.c

F:	drivers/rtc/rtc-armada38x.c

F:	arch/arm/boot/dts/armada*

F:	arch/arm/boot/dts/kirkwood*







ARM/Marvell Berlin SoC support

ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

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-berlin/

F:	arch/arm/mach-berlin/

F:	arch/arm/boot/dts/berlin*







ARM/Marvell Dove/MV78xx0/Orion SOC support

ARM/Marvell Dove/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Jason Cooper <jason@lakedaemon.net>
@@ -1215,6 +1225,9 @@ F: arch/arm/mach-dove/ 
F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-orion5x/

F:	arch/arm/mach-orion5x/

F:	arch/arm/plat-orion/

F:	arch/arm/plat-orion/

F:	arch/arm/boot/dts/dove*

F:	arch/arm/boot/dts/orion5x*







ARM/Orion SoC/Technologic Systems TS-78xx platform support

ARM/Orion SoC/Technologic Systems TS-78xx platform support

M:	Alexander Clouter <alex@digriz.org.uk>

M:	Alexander Clouter <alex@digriz.org.uk>
@@ -1366,6 +1379,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>

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
@@ -1439,9 +1453,10 @@ ARM/SOCFPGA ARCHITECTURE 
M:	Dinh Nguyen <dinguyen@opensource.altera.com>

M:	Dinh Nguyen <dinguyen@opensource.altera.com>

S:	Maintained

S:	Maintained

F:	arch/arm/mach-socfpga/

F:	arch/arm/mach-socfpga/

F:	arch/arm/boot/dts/socfpga*

F:	arch/arm/configs/socfpga_defconfig

W:	http://www.rocketboards.org

W:	http://www.rocketboards.org

T:	git://git.rocketboards.org/linux-socfpga.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git

T:	git://git.rocketboards.org/linux-socfpga-next.git





ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT

ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT

M:	Dinh Nguyen <dinguyen@opensource.altera.com>

M:	Dinh Nguyen <dinguyen@opensource.altera.com>
@@ -1929,7 +1944,7 @@ S: Maintained 
F:	drivers/net/wireless/b43legacy/

F:	drivers/net/wireless/b43legacy/





BACKLIGHT CLASS/SUBSYSTEM

BACKLIGHT CLASS/SUBSYSTEM

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

M:	Lee Jones <lee.jones@linaro.org>

M:	Lee Jones <lee.jones@linaro.org>

S:	Maintained

S:	Maintained

F:	drivers/video/backlight/

F:	drivers/video/backlight/
@@ -2116,8 +2131,9 @@ S: Supported 
F:	drivers/net/ethernet/broadcom/bnx2x/

F:	drivers/net/ethernet/broadcom/bnx2x/





BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE

BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE

M:	Christian Daudt <bcm@fixthebug.org>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

L:	bcm-kernel-feedback-list@broadcom.com

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://github.com/broadcom/mach-bcm

T:	git git://github.com/broadcom/mach-bcm

S:	Maintained

S:	Maintained
@@ -2168,7 +2184,6 @@ S: Maintained 
F:	drivers/usb/gadget/udc/bcm63xx_udc.*

F:	drivers/usb/gadget/udc/bcm63xx_udc.*





BROADCOM BCM7XXX ARM ARCHITECTURE

BROADCOM BCM7XXX ARM ARCHITECTURE

M:	Marc Carino <marc.ceeeee@gmail.com>

M:	Brian Norris <computersforpeace@gmail.com>

M:	Brian Norris <computersforpeace@gmail.com>

M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>
@@ -3912,7 +3927,7 @@ F: drivers/extcon/ 
F:	Documentation/extcon/

F:	Documentation/extcon/





EXYNOS DP DRIVER

EXYNOS DP DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	dri-devel@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

S:	Maintained

S:	Maintained

F:	drivers/gpu/drm/exynos/exynos_dp*

F:	drivers/gpu/drm/exynos/exynos_dp*
@@ -4371,11 +4386,10 @@ F: fs/gfs2/ 
F:	include/uapi/linux/gfs2_ondisk.h

F:	include/uapi/linux/gfs2_ondisk.h





GIGASET ISDN DRIVERS

GIGASET ISDN DRIVERS

M:	Hansjoerg Lipp <hjlipp@web.de>

M:	Paul Bolle <pebolle@tiscali.nl>

M:	Tilman Schmidt <tilman@imap.cc>

L:	gigaset307x-common@lists.sourceforge.net

L:	gigaset307x-common@lists.sourceforge.net

W:	http://gigaset307x.sourceforge.net/

W:	http://gigaset307x.sourceforge.net/

S:	Maintained

S:	Odd Fixes

F:	Documentation/isdn/README.gigaset

F:	Documentation/isdn/README.gigaset

F:	drivers/isdn/gigaset/

F:	drivers/isdn/gigaset/

F:	include/uapi/linux/gigaset_dev.h

F:	include/uapi/linux/gigaset_dev.h
@@ -5048,7 +5062,7 @@ M: Hal Rosenstock <hal.rosenstock@gmail.com> 
L:	linux-rdma@vger.kernel.org

L:	linux-rdma@vger.kernel.org

W:	http://www.openfabrics.org/

W:	http://www.openfabrics.org/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:	git git://github.com/dledford/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git

S:	Supported

S:	Supported

F:	Documentation/infiniband/

F:	Documentation/infiniband/

F:	drivers/infiniband/

F:	drivers/infiniband/
@@ -6953,6 +6967,17 @@ T: git git://git.rocketboards.org/linux-socfpga-next.git 
S:	Maintained

S:	Maintained

F:	arch/nios2/

F:	arch/nios2/





NOKIA N900 POWER SUPPLY DRIVERS

M:	Pali Rohár <pali.rohar@gmail.com>

S:	Maintained

F:	include/linux/power/bq2415x_charger.h

F:	include/linux/power/bq27x00_battery.h

F:	include/linux/power/isp1704_charger.h

F:	drivers/power/bq2415x_charger.c

F:	drivers/power/bq27x00_battery.c

F:	drivers/power/isp1704_charger.c

F:	drivers/power/rx51_battery.c



NTB DRIVER

NTB DRIVER

M:	Jon Mason <jdmason@kudzu.us>

M:	Jon Mason <jdmason@kudzu.us>

M:	Dave Jiang <dave.jiang@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>
@@ -7541,7 +7566,7 @@ S: Maintained 
F:	drivers/pci/host/*rcar*

F:	drivers/pci/host/*rcar*





PCI DRIVER FOR SAMSUNG EXYNOS

PCI DRIVER FOR SAMSUNG EXYNOS

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-pci@vger.kernel.org

L:	linux-pci@vger.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)
@@ -7549,7 +7574,7 @@ S: Maintained 
F:	drivers/pci/host/pci-exynos.c

F:	drivers/pci/host/pci-exynos.c





PCI DRIVER FOR SYNOPSIS DESIGNWARE

PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-pci@vger.kernel.org

L:	linux-pci@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/pci/host/*designware*

F:	drivers/pci/host/*designware*
@@ -8505,7 +8530,7 @@ S: Supported 
F:	sound/soc/samsung/

F:	sound/soc/samsung/





SAMSUNG FRAMEBUFFER DRIVER

SAMSUNG FRAMEBUFFER DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-fbdev@vger.kernel.org

L:	linux-fbdev@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/video/fbdev/s3c-fb.c

F:	drivers/video/fbdev/s3c-fb.c
@@ -8810,10 +8835,11 @@ W: http://www.emulex.com 
S:	Supported

S:	Supported

F:	drivers/scsi/be2iscsi/

F:	drivers/scsi/be2iscsi/





SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER

M:	Sathya Perla <sathya.perla@emulex.com>

M:	Sathya Perla <sathya.perla@avagotech.com>

M:	Subbu Seetharaman <subbu.seetharaman@emulex.com>

M:	Ajit Khaparde <ajit.khaparde@avagotech.com>

M:	Ajit Khaparde <ajit.khaparde@emulex.com>

M:	Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>

M:	Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://www.emulex.com

W:	http://www.emulex.com

S:	Supported

S:	Supported