Commit 6d8bf28f authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

parents ace98819 d573e8a7

Documentation/filesystems/overlayfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ beneath or above the path of another overlay lower layer path. 


Using an upper layer path and/or a workdir path that are already used by

another overlay mount is not allowed and may fail with EBUSY.  Using

partially overlapping paths is not allowed but will not fail with EBUSY.

partially overlapping paths is not allowed and may fail with EBUSY.

If files are accessed from two overlayfs mounts which share or overlap the

upper layer and/or workdir path the behavior of the overlay is undefined,

though it will not result in a crash or deadlock.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 73

SUBLEVEL = 75

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/am571x-idk.dts

+1 −6
Original line number Diff line number Diff line
@@ -98,14 +98,9 @@ 
};



&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-names = "default", "hs";

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50_rev20 &mmc1_iodelay_ddr50_conf>;

	pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;

};



&mmc2 {

arch/arm/boot/dts/am572x-idk.dts

+1 −6
Original line number Diff line number Diff line
@@ -20,14 +20,9 @@ 
};



&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-names = "default", "hs";

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>;

	pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;

};



&mmc2 {

arch/arm/boot/dts/am574x-idk.dts

+1 −6
Original line number Diff line number Diff line
@@ -24,14 +24,9 @@ 
};



&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-names = "default", "hs";

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_default>;

	pinctrl-3 = <&mmc1_pins_hs>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_conf>;

	pinctrl-6 = <&mmc1_pins_ddr50 &mmc1_iodelay_sdr104_conf>;

};



&mmc2 {