Unverified Commit 051a06cb authored Jul 24, 2024 by openeuler-ci-bot Committed by Gitee Jul 24, 2024

!10304 Backport 5.10.211 LTS patches from upstream

Merge Pull Request from: @sanglipeng

https://gitee.com/openeuler/kernel/issues/IAF2J4

Conflicts:
Already merged(28):
168ed59170de scsi: target: core: Add TMF to tmr_list handling
5ffab99e070b wifi: mac80211: fix race condition on enabling fast-xmit
512ee6d6041e fbdev: savage: Error out if pixclock equals zero
cd36da760bd1 fbdev: sis: Error out if pixclock equals zero
927794a02169 ext4: avoid allocating blocks from corrupted group in ext4_mb_try_best_found()
c432094aa7c9 dmaengine: ti: edma: Add some null pointer checks to the edma_probe
4f2c95015ec2 nvme-fc: do not wait in vain when unloading module
4fff3d735bae efi: runtime: Fix potential overflow of soft-reserved region size
3f38d22e645e IB/hfi1: Fix sdma.h tx->num_descs off-by-one error
3c652f6fa1e1 dm-crypt: don't modify the data when using authenticated encryption
2e534fd15e5c gtp: fix use-after-free and null-ptr-deref in gtp_genl_dump_pdp()
dcb4d1426859 gtp: fix use-after-free and null-ptr-deref in gtp_genl_dump_pdp()
70d92abbe296 ARM: ep93xx: Add terminator to gpiod_lookup_table
57ca0e16f393 usb: gadget: ncm: Avoid dropping datagrams of properly parsed NTBs
3fa240bb6b2d IB/hfi1: Fix a memleak in init_credit_return
5a5c039dac1b RDMA/srpt: Support specifying the srpt_service_guid parameter
5639414a52a2 RDMA/qedr: Fix qedr_create_user_qp error flow
65c38f23d10f ipv6: sr: fix possible use-after-free and null-ptr-deref
31ea574aeca1 netfilter: nf_tables: set dormant flag on hook register failure
b49b022f7dfc drm/amd/display: Fix memory leak in dm_sw_fini()
ea1cd64d59f2 fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio
dbc9b22d0ed3 arp: Prevent overflow in arp_req_get().
b03c8099a738 smb: client: fix OOB in receive_encrypted_standard()
e94da8aca2e7 spi: hisi-sfc-v3xx: Return IRQ_NONE if no interrupts were detected
ffeb72a80a82 ext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal()
6360869cc4e9 jbd2: Fix wrongly judgement for buffer head removing while doing checkpoint
d9b5e2b7a819 afs: Increase buffer size in afs_update_volume_status()
94ebf71bddbc ext4: regenerate buddy after block freeing failed if under fc replay

Rejected(7):
cb1609ef8aa2 jbd2: remove redundant buffer io error checks
69389d82ab6d jbd2: recheck chechpointing non-dirty buffer
4820e84e2852 tls: rx: jump to a more appropriate label
31e10d6cb0c9 tls: stop recv() if initial process_rx_list gave us non-DATA
e4bc31174507 sched/rt: Disallow writing invalid values to sched_rt_period_us
c1b447a21a65 packet: move from strlcpy with unused retval to strscpy
f6ce90567ed3 net: dev: Convert sa_data to flexible array in struct sockaddr

Total patches: 122 - 28 - 7 = 87

Link:https://gitee.com/openeuler/kernel/pulls/10304

Reviewed-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

parents b4a81101 dcde8227

arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		wlan {
		label = "bcm53xx:blue:wlan";
		gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "default-off";
		};

		system {

arch/arm/boot/dts/bcm47189-luxul-xap-810.dts

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		5ghz {
		label = "bcm53xx:blue:5ghz";
		gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
		linux,default-trigger = "default-off";
		};

		system {
		@@ -42,7 +41,6 @@
		2ghz {
		label = "bcm53xx:blue:2ghz";
		gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>;
		linux,default-trigger = "default-off";
		};
		};

arch/arm/boot/dts/imx6sx.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -981,6 +981,8 @@
		<&clks IMX6SX_CLK_USDHC1>;
		clock-names = "ipg", "ahb", "per";
		bus-width = <4>;
		fsl,tuning-start-tap = <20>;
		fsl,tuning-step= <2>;
		status = "disabled";
		};

		@@ -993,6 +995,8 @@
		<&clks IMX6SX_CLK_USDHC2>;
		clock-names = "ipg", "ahb", "per";
		bus-width = <4>;
		fsl,tuning-start-tap = <20>;
		fsl,tuning-step= <2>;
		status = "disabled";
		};

		@@ -1005,6 +1009,8 @@
		<&clks IMX6SX_CLK_USDHC3>;
		clock-names = "ipg", "ahb", "per";
		bus-width = <4>;
		fsl,tuning-start-tap = <20>;
		fsl,tuning-step= <2>;
		status = "disabled";
		};

arch/arm64/boot/dts/rockchip/px30.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -577,6 +577,7 @@
		clock-names = "spiclk", "apb_pclk";
		dmas = <&dmac 12>, <&dmac 13>;
		dma-names = "tx", "rx";
		num-cs = <2>;
		pinctrl-names = "default";
		pinctrl-0 = <&spi0_clk &spi0_csn &spi0_miso &spi0_mosi>;
		#address-cells = <1>;
		@@ -592,6 +593,7 @@
		clock-names = "spiclk", "apb_pclk";
		dmas = <&dmac 14>, <&dmac 15>;
		dma-names = "tx", "rx";
		num-cs = <2>;
		pinctrl-names = "default";
		pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>;
		#address-cells = <1>;

arch/arm64/kvm/vgic/vgic-its.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,9 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
		}

		irq = vgic_get_irq(vcpu->kvm, NULL, intids[i]);
		if (!irq)
		continue;

		raw_spin_lock_irqsave(&irq->irq_lock, flags);
		irq->pending_latch = pendmask & (1U << bit_nr);
		vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
		@@ -1408,6 +1411,8 @@ static int vgic_its_cmd_handle_movall(struct kvm kvm, struct vgic_its its,

		for (i = 0; i < irq_count; i++) {
		irq = vgic_get_irq(kvm, NULL, intids[i]);
		if (!irq)
		continue;

		update_affinity(irq, vcpu2);