Commit 4eebf60b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v4.2-rc7' into drm-next 

Linux 4.2-rc7

Backmerge master for i915 fixes
parents 8f9cb507 2c6625cd

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andreas Herrmann <aherrman@de.ibm.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrew Morton <akpm@linux-foundation.org>

Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Andy Adamson <andros@citi.umich.edu>

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "qcom,kpss-acc-v2"

			    "rockchip,rk3066-smp"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"





	- cpu-release-addr

	- cpu-release-addr

		Usage: required for systems that have an "enable-method"

		Usage: required for systems that have an "enable-method"

Documentation/devicetree/bindings/dma/apm-xgene-dma.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ Example: 
			device_type = "dma";

			device_type = "dma";

			reg = <0x0 0x1f270000 0x0 0x10000>,

			reg = <0x0 0x1f270000 0x0 0x10000>,

			      <0x0 0x1f200000 0x0 0x10000>,

			      <0x0 0x1f200000 0x0 0x10000>,

			      <0x0 0x1b008000 0x0 0x2000>,

			      <0x0 0x1b000000 0x0 0x400000>,

			      <0x0 0x1054a000 0x0 0x100>;

			      <0x0 0x1054a000 0x0 0x100>;

			interrupts = <0x0 0x82 0x4>,

			interrupts = <0x0 0x82 0x4>,

				     <0x0 0xb8 0x4>,

				     <0x0 0xb8 0x4>,

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;

};

};