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

Commit eec8df2f authored by Amit Pundir's avatar Amit Pundir
Browse files

Merge tag 'v4.13-rc3' 



Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parents 209675bd 16f73eb0

Documentation/device-mapper/dm-raid.txt

+1 −0
Original line number Diff line number Diff line
@@ -343,3 +343,4 @@ Version History 
1.11.0  Fix table line argument order

	(wrong raid10_copies/raid10_format sequence)

1.11.1  Add raid4/5/6 journal write-back support via journal_mode option

1.12.1  fix for MD deadlock between mddev_suspend() and md_write_start() available

Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Required properties: 


Optional properties:

- clocks: Reference to the crypto engine clock.

- dma-mask: The address mask limitation. Defaults to 64.



Example:
@@ -24,6 +23,5 @@ Example: 
		interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3",

				  "eip";

		clocks = <&cpm_syscon0 1 26>;

		dma-mask = <0xff 0xffffffff>;

		status = "disabled";

	};

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ Example: 
	};



	dwmmc0@12200000 {

		num-slots = <1>;

		cap-mmc-highspeed;

		cap-sd-highspeed;

		broken-cd;

Documentation/devicetree/bindings/mmc/img-dw-mshc.txt

+0 −1
Original line number Diff line number Diff line
@@ -24,6 +24,5 @@ Example: 


		fifo-depth = <0x20>;

		bus-width = <4>;

		num-slots = <1>;

		disable-wp;

	};

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ Example: 


	/* Board portion */

	dwmmc0@fcd03000 {

		num-slots = <1>;

		vmmc-supply = <&ldo12>;

		fifo-depth = <0x100>;

		pinctrl-names = "default";
@@ -52,7 +51,6 @@ Example: 


	dwmmc_1: dwmmc1@f723e000 {

		compatible = "hisilicon,hi6220-dw-mshc";

		num-slots = <0x1>;

		bus-width = <0x4>;

		disable-wp;

		cap-sd-highspeed;