Unverified Commit 0c40bf67 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1506 Backport 5.10.157 LTS patches from upstream 

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

Conflicts:

context confilict(1):  
23c03ee0eec4: rxrpc: Use refcount_t rather than atomic_t

Already merged(19):
3535c632e6d1: rxrpc: Fix race between conn bundle lookup and bundle removal [ZDI-CAN-15975]
e87a077d09c0: tipc: set con sock in tipc_conn_alloc
4058e3b74ab3: tipc: add an extra conn_get in tipc_conn_alloc
23e9d815fad8: binder: avoid potential data leakage when copying txn
5204296fc766: binder: read pre-translated fds from sender buffer
c9d3f25a7f4e: binder: defer copies of pre-patched txn data
2e3c27f24173: binder: fix pointer cast warning
017de842533f: binder: Address corner cases in deferred copy and fixup
ae9e0cc973fb: binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
7c6535fb4d67: wifi: wilc1000: validate pairwise and authentication suite offsets
905f886eae4b: wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_OPER_CHANNEL attribute
5a068535c007: wifi: wilc1000: validate length of IEEE80211_P2P_ATTR_CHANNEL_LIST attribute
3eb6b89a4e9f: wifi: wilc1000: validate number of channels
86f0082fb947: drm/i915: fix TLB invalidation for Gen12 video and compute engines
fa5f2c72d39f: block, bfq: fix null pointer dereference in bfq_bio_bfqg()
86ba9c859577: ext4: fix use-after-free in ext4_ext_shift_extents
e0d2c59ee995: genirq: Always limit the affinity to online CPUs
9d90a2b98e6e: irqchip/gic-v3: Always trust the managed affinity provided by the core code
b56d6e55857b: genirq: Take the proposed affinity at face value if force==true

Rejected(2):
f8f80d532f78: genirq/msi: Shutdown managed interrupts with unsatifiable affinities
497653f6d239: xfrm: fix "disable_policy" on ipv4 early demux

Total patches: 158 - 19 -2  = 137
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1506

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4e4284a7 ce6d8309

arch/arm/boot/dts/am335x-pcm-953.dtsi

+13 −15
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
	compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx";



	/* Power */

	regulators {

		vcc3v3: fixedregulator@1 {

	vcc3v3: fixedregulator1 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;
@@ -21,14 +20,13 @@ 
		regulator-boot-on;

	};



		vcc1v8: fixedregulator@2 {

	vcc1v8: fixedregulator2 {

		compatible = "regulator-fixed";

		regulator-name = "vcc1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-boot-on;

	};

	};



	/* User IO */

	user_leds: user_leds {

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ 


				};



				usb1 {

					pinctrl_usb1_vbus_gpio: usb1_vbus_gpio {

						atmel,pins =

							<AT91_PIOC 5 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;	/* PC5 GPIO */

					};

				};



				mmc0_slot1 {

					pinctrl_board_mmc0_slot1: mmc0_slot1-board {

						atmel,pins =
@@ -84,6 +91,8 @@ 
			};



			usb1: gadget@fffa4000 {

				pinctrl-0 = <&pinctrl_usb1_vbus_gpio>;

				pinctrl-names = "default";

				atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};

arch/arm/boot/dts/imx6q-prti6q.dts

+2 −2
Original line number Diff line number Diff line
@@ -364,8 +364,8 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_wifi>;

		interrupts-extended = <&gpio1 30 IRQ_TYPE_LEVEL_HIGH>;

		ref-clock-frequency = "38400000";

		tcxo-clock-frequency = "19200000";

		ref-clock-frequency = <38400000>;

		tcxo-clock-frequency = <19200000>;

	};

};

arch/arm/mach-mxs/mach-mxs.c

+3 −1
Original line number Diff line number Diff line
@@ -387,8 +387,10 @@ static void __init mxs_machine_init(void) 


	root = of_find_node_by_path("/");

	ret = of_property_read_string(root, "model", &soc_dev_attr->machine);

	if (ret)

	if (ret) {

		kfree(soc_dev_attr);

		return;

	}



	soc_dev_attr->family = "Freescale MXS Family";

	soc_dev_attr->soc_id = mxs_get_soc_id();

arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 
	cap-sd-highspeed;

	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

	disable-wp;

	max-frequency = <150000000>;

	max-frequency = <40000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

	vmmc-supply = <&vcc3v3_baseboard>;