Unverified Commit 7c4ab77d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1473 Backport 5.10.156 LTS patches from upstream. 

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.156 LTS patches from upstream.

Conflicts:

Already merged(5):
e929ec98c0c3: macvlan: enforce a consistent minimal mtu
6322dda48334: ntfs: fix out-of-bounds read in ntfs_attr_find() 
e60f37a1d379: bpf, test_run: Fix alignment problem in bpf_prog_test_run_skb()
36b5095b07ac: net: fix a concurrency bug in l2tp_tunnel_register()
7deb7a9d33e4: kcm: avoid potential race in kcm_tx_work

Rejected(1):
4cba73f2d6fc: net: hinic: Fix error handling in hinic_module_init()
6e9334436d78: net: use struct_group to copy ip/ipv6 header addresses

Total patches: 148 - 5 - 2 = 141 
 
Link:https://gitee.com/openeuler/kernel/pulls/1473

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 0ceaf921 be741bd0

Documentation/process/code-of-conduct-interpretation.rst

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ the Technical Advisory Board (TAB) or other maintainers if you're 
uncertain how to handle situations that come up.  It will not be

considered a violation report unless you want it to be.  If you are

uncertain about approaching the TAB or any other maintainers, please

reach out to our conflict mediator, Joanna Lee <joanna.lee@gesmer.com>.

reach out to our conflict mediator, Joanna Lee <jlee@linuxfoundation.org>.



In the end, "be kind to each other" is really what the end goal is for

everybody.  We know everyone is human and we all fail at times, but the

arch/arm/boot/dts/imx7s.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ 
		gpmi: nand-controller@33002000 {

			compatible = "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <0>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ 
		gpmi: nand-controller@33002000 {

			compatible = "fsl,imx8mm-gpmi-nand", "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <0>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mn.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ 
		gpmi: nand-controller@33002000 {

			compatible = "fsl,imx8mn-gpmi-nand", "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <0>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/include/asm/cputype.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
	(((midr) & MIDR_IMPLEMENTOR_MASK) >> MIDR_IMPLEMENTOR_SHIFT)



#define MIDR_CPU_MODEL(imp, partnum) \

	(((imp)			<< MIDR_IMPLEMENTOR_SHIFT) | \

	((_AT(u32, imp)		<< MIDR_IMPLEMENTOR_SHIFT) | \

	(0xf			<< MIDR_ARCHITECTURE_SHIFT) | \

	((partnum)		<< MIDR_PARTNUM_SHIFT))