Commit 92311e46 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.2-rc4 into tty-next 



Other serial driver work wants to build on patches now in 4.2-rc4 so
merge the branch so this can properly happen.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents d6847793 cbfe8fa6

Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -35,3 +35,6 @@ the PCIe specification. 




                      NOTE: this only applies to the SMMU itself, not

                      NOTE: this only applies to the SMMU itself, not

                      masters connected upstream of the SMMU.

                      masters connected upstream of the SMMU.



- hisilicon,broken-prefetch-cmd

                    : Avoid sending CMD_PREFETCH_* commands to the SMMU.

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ Required properties: 
	       "fsl,imx6sx-usdhc"

	       "fsl,imx6sx-usdhc"





Optional properties:

Optional properties:

- fsl,cd-controller : Indicate to use controller internal card detection

- fsl,wp-controller : Indicate to use controller internal write protection

- fsl,wp-controller : Indicate to use controller internal write protection

- fsl,delay-line : Specify the number of delay cells for override mode.

- fsl,delay-line : Specify the number of delay cells for override mode.

  This is used to set the clock delay for DLL(Delay Line) on override mode

  This is used to set the clock delay for DLL(Delay Line) on override mode
@@ -35,7 +34,6 @@ esdhc@70004000 { 
	compatible = "fsl,imx51-esdhc";

	compatible = "fsl,imx51-esdhc";

	reg = <0x70004000 0x4000>;

	reg = <0x70004000 0x4000>;

	interrupts = <1>;

	interrupts = <1>;

	fsl,cd-controller;

	fsl,wp-controller;

	fsl,wp-controller;

};

};

MAINTAINERS

+15 −1
Original line number Original line Diff line number Diff line
@@ -5899,7 +5899,6 @@ S: Supported 
F:	Documentation/s390/kvm.txt

F:	Documentation/s390/kvm.txt

F:	arch/s390/include/asm/kvm*

F:	arch/s390/include/asm/kvm*

F:	arch/s390/kvm/

F:	arch/s390/kvm/

F:	drivers/s390/kvm/





KERNEL VIRTUAL MACHINE (KVM) FOR ARM

KERNEL VIRTUAL MACHINE (KVM) FOR ARM

M:	Christoffer Dall <christoffer.dall@linaro.org>

M:	Christoffer Dall <christoffer.dall@linaro.org>
@@ -6839,6 +6838,12 @@ T: git git://linuxtv.org/anttip/media_tree.git 
S:	Maintained

S:	Maintained

F:	drivers/media/usb/msi2500/

F:	drivers/media/usb/msi2500/





MSYSTEMS DISKONCHIP G3 MTD DRIVER

M:	Robert Jarzmik <robert.jarzmik@free.fr>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	drivers/mtd/devices/docg3*



MT9M032 APTINA SENSOR DRIVER

MT9M032 APTINA SENSOR DRIVER

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	linux-media@vger.kernel.org

L:	linux-media@vger.kernel.org
@@ -10896,6 +10901,15 @@ F: drivers/block/virtio_blk.c 
F:	include/linux/virtio_*.h

F:	include/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h





VIRTIO DRIVERS FOR S390

M:	Christian Borntraeger <borntraeger@de.ibm.com>

M:	Cornelia Huck <cornelia.huck@de.ibm.com>

L:	linux-s390@vger.kernel.org

L:	virtualization@lists.linux-foundation.org

L:	kvm@vger.kernel.org

S:	Supported

F:	drivers/s390/virtio/



VIRTIO GPU DRIVER

VIRTIO GPU DRIVER

M:	David Airlie <airlied@linux.ie>

M:	David Airlie <airlied@linux.ie>

M:	Gerd Hoffmann <kraxel@redhat.com>

M:	Gerd Hoffmann <kraxel@redhat.com>

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 4

VERSION = 4

PATCHLEVEL = 2

PATCHLEVEL = 2

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Hurr durr I'ma sheep

NAME = Hurr durr I'ma sheep





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/boot/dts/imx25-pdk.dts

+3 −2
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */





/dts-v1/;

/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/input.h>

#include "imx25.dtsi"

#include "imx25.dtsi"
@@ -114,8 +115,8 @@ 
&esdhc1 {

&esdhc1 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio2 1 0>;

	cd-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio2 0 0>;

	wp-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;

	status = "okay";

	status = "okay";

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE