Unverified Commit 75edf7e8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!393 Backport 5.10.143 - 5.10.144 LTS 

Merge Pull Request from: @zhangjialin11 
 
Backport 5.10.143 LTS patches from upstream.

Conflicts:

Already merged(7):
2ead78fbe6b5 sch_sfb: Also store skb len before calling child enqueue
2ee85ac1b29d sch_sfb: Don't assume the skb is still around after enqueueing to child
e12ce30fe593 netfilter: nf_conntrack_irc: Fix forged IP logic
b2e82e325a84 RDMA/hns: Fix supported page size
dee1e2b18cf5 cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock
bfbacc2ef7b5 cgroup: Elide write-locking threadgroup_rwsem when updating csses on an empty subtree
918d9c4a4bdf efi: capsule-loader: Fix use-after-free in efi_capsule_write

Defered(2):
71d3adbb2890 arm64: errata: add detection for AMEVCNTR01 incrementing incorrectly
13c8f561be38 fs: only do a memory barrier for the first set_buffer_uptodate()

Total patches: 76 - 7 - 2 = 67

Backport 5.10.144 LTS patches from upstream.

Conflicts:

Already merged(3):
35371fd68807 x86/ftrace: Use alternative RET encoding
4586df06a020 x86/ibt,ftrace: Make function-graph play nice
33015556a943 Revert "x86/ftrace: Use alternative RET encoding"

Total patches: 23 - 3 = 20 
 
Link:https://gitee.com/openeuler/kernel/pulls/393

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents d800cf74 821bcfba

Documentation/input/joydev/joystick.rst

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module. This includes: 
* AVB Mag Turbo Force

* AVB Top Shot Pegasus

* AVB Top Shot Force Feedback Racing Wheel

* Boeder Force Feedback Wheel

* Logitech WingMan Force

* Logitech WingMan Force Wheel

* Guillemot Race Leader Force Feedback

arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi

+10 −11
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ 
		regulators {

			vdd_3v3: VDD_IO {

				regulator-name = "VDD_IO";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3700000>;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-initial-mode = <2>;

				regulator-allowed-modes = <2>, <4>;

				regulator-always-on;
@@ -81,8 +81,8 @@ 


			vddio_ddr: VDD_DDR {

				regulator-name = "VDD_DDR";

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1850000>;

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-initial-mode = <2>;

				regulator-allowed-modes = <2>, <4>;

				regulator-always-on;
@@ -104,8 +104,8 @@ 


			vdd_core: VDD_CORE {

				regulator-name = "VDD_CORE";

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1850000>;

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <1250000>;

				regulator-initial-mode = <2>;

				regulator-allowed-modes = <2>, <4>;

				regulator-always-on;
@@ -146,8 +146,8 @@ 


			LDO1 {

				regulator-name = "LDO1";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3700000>;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;



				regulator-state-standby {
@@ -161,9 +161,8 @@ 


			LDO2 {

				regulator-name = "LDO2";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3700000>;

				regulator-always-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;



				regulator-state-standby {

					regulator-on-in-suspend;

arch/arm/boot/dts/at91-sama5d2_icp.dts

+10 −11
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ 
			regulators {

				vdd_io_reg: VDD_IO {

					regulator-name = "VDD_IO";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -214,8 +214,8 @@ 


				VDD_DDR {

					regulator-name = "VDD_DDR";

					regulator-min-microvolt = <600000>;

					regulator-max-microvolt = <1850000>;

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -233,8 +233,8 @@ 


				VDD_CORE {

					regulator-name = "VDD_CORE";

					regulator-min-microvolt = <600000>;

					regulator-max-microvolt = <1850000>;

					regulator-min-microvolt = <1250000>;

					regulator-max-microvolt = <1250000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;
@@ -256,7 +256,6 @@ 
					regulator-max-microvolt = <1850000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;

					regulator-always-on;



					regulator-state-standby {

						regulator-on-in-suspend;
@@ -271,8 +270,8 @@ 


				LDO1 {

					regulator-name = "LDO1";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <2500000>;

					regulator-max-microvolt = <2500000>;

					regulator-always-on;



					regulator-state-standby {
@@ -286,8 +285,8 @@ 


				LDO2 {

					regulator-name = "LDO2";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <3700000>;

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;



					regulator-state-standby {

arch/arm/boot/dts/imx28-evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "sst,sst25vf016b", "jedec,spi-nor";

arch/arm/boot/dts/imx28-m28evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "m25p80", "jedec,spi-nor";