Commit 1fe7294d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-7.0-4' of... 

Merge tag 'kvm-s390-master-7.0-4' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: One very last second fix

Fix one more gmap-rewrite issue: races with partial gmap invalidations.
parents 0e9b0e01 3ffe5eb4

Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ properties: 
      - const: core



  iommus:

    maxItems: 2

    maxItems: 1



  interconnects:

    items:
@@ -107,8 +107,7 @@ examples: 
        interconnect-names = "mdp0-mem",

                             "cpu-cfg";



        iommus = <&apps_smmu 0x420 0x2>,

                 <&apps_smmu 0x421 0x0>;

        iommus = <&apps_smmu 0x420 0x2>;

        ranges;



        display-controller@5e01000 {

Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml

+2 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ properties: 
      - const: vcodec0_bus



  iommus:

    maxItems: 5

    maxItems: 2



  interconnects:

    maxItems: 2
@@ -102,10 +102,7 @@ examples: 
        memory-region = <&pil_video_mem>;



        iommus = <&apps_smmu 0x860 0x0>,

                 <&apps_smmu 0x880 0x0>,

                 <&apps_smmu 0x861 0x04>,

                 <&apps_smmu 0x863 0x0>,

                 <&apps_smmu 0x804 0xe0>;

                 <&apps_smmu 0x880 0x0>;



        interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG

                         &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

arch/arm/boot/dts/microchip/sam9x7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ pioB: gpio@fffff600 { 
				interrupt-controller;

				#gpio-cells = <2>;

				gpio-controller;

				#gpio-lines = <26>;

				#gpio-lines = <27>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;

			};

arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -36,12 +36,8 @@ &clks { 
&gpmi {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_gpmi_nand>;

	status = "okay";



	nand@0 {

		reg = <0>;

	nand-on-flash-bbt;

	};

	status = "okay";

};



&i2c3 {

arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -172,12 +172,8 @@ eth_phy: ethernet-phy@0 { 
&gpmi {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_gpmi_nand>;

	status = "okay";



	nand@0 {

		reg = <0>;

	nand-on-flash-bbt;

	};

	status = "okay";

};



&i2c1 {