Unverified Commit 0547e83f authored Mar 06, 2024 by openeuler-ci-bot Committed by Gitee Mar 06, 2024

!4905 Backport 5.10.195 LTS patches from upstream

Merge Pull Request from: @sanglipeng

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

Conflicts:

Already merged(26):
357badc01add drm/amd/display: Exit idle optimizations before attempt to access PHY
625bf86bf53e crypto: api - Use work queue in crypto_destroy_instance
98ef243d5900 audit: fix possible soft lockup in __audit_inode_child()
5541827d13cf netfilter: xt_sctp: validate the flag_info count
3e39008e9e30 igb: set max size RX buffer when store bad packet is enabled
8c90c4e61929 printk: ringbuffer: Fix truncating buffer size min_t cast
5c5f02e16b91 ipmi_si: fix a memleak in try_smi_init()
ffed0c8fcf04 scsi: mpt3sas: Perform additional retries if doorbell read returns 0
3cef18d13f37 USB: core: Unite old scheme and new scheme descriptor reads
6ceffc2ecf3d USB: core: Change usb_get_device_descriptor() API
9d241c5d9a9b USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
beba5051dd34 USB: core: Fix oversight in SuperSpeed initialization
780f60dde296 netfilter: nfnetlink_osf: avoid OOB read
7c8ddcdab1b9 net: ipv4: fix one memleak in __inet_del_ifa()
a5096cc6e783 net/tls: do not free tls_rec on async operation in bpf_exec_tx_verdict()
746b363bef41 Bluetooth: btsdio: fix use after free bug in btsdio_remove due to race condition
644e93a79056 fs: Fix error checking for d_hash_and_lookup()
b08cc6c0396f net/sched: sch_hfsc: Ensure inner classes have fsc curve
905e316e5e99 quota: rename dquot_active() to inode_quota_active()
b6aca9f5ab29 scsi: hisi_sas: Fix warnings detected by sparse
1e5eac0022f4 scsi: hisi_sas: Fix normally completed I/O analysed as failed
c5d30d6aa83d tracing: Fix race issue between cpu buffer write and swap
83091f8ac03f netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
a1b711c370f5 netfilter: xt_u32: validate user space input
746a8df5e4d2 net: sched: sch_qfq: Fix UAF in qfq_dequeue()
97ef9ba7df1c net: hns3: fix the port information display when sfp is absent

Rejected(10):
c709c7ca020a configfs: fix a race in configfs_lookup()
a5da2849db58 quota: factor out dquot_write_dquot()
af4ff4748985 quota: add new helper dquot_active()
86d89987f099 quota: fix dqput() to follow the guarantees dquot_srcu should provide
519b9e3e5ce7 scsi: hisi_sas: Print SAS address for v3 hw erroneous completion print
d84e5d445af1 scsi: libsas: Introduce more SAM status code aliases in enum exec_status
634220605198 scsi: hisi_sas: Modify v3 HW SSP underflow error processing
0d383e555fa6 scsi: hisi_sas: Modify v3 HW SATA completion error processing
e90e70343b24 ip_tunnels: use DEV_STATS_INC()
160fdb4116e7 ipv4: ignore dst hint for multipath routes

Kabi broken(3):
0c0547d2a60a tracing: Introduce pipe_cpumask to avoid race on trace_pipes
5103216b863f tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY
356da2d5c084 scsi: core: Use 32-bit hostnum in scsi_host_lookup()

Warning fix(1):
d0952ce316d1 drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()

Total patches: 403 - 26 - 10 - 3 + 1 = 365

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

Reviewed-by: Jialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parents 995c4678 37e0af13

Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@ description: \|
		reads required input clock frequencies from the devicetree and acts as clock
		provider for all clock consumers of PS clocks.

		select: false

		properties:
		compatible:
		const: xlnx,versal-clk

Documentation/scsi/scsi_mid_low_api.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -1195,11 +1195,11 @@ Members of interest:
		- pointer to scsi_device object that this command is
		associated with.
		resid
		- an LLD should set this signed integer to the requested
		- an LLD should set this unsigned integer to the requested
		transfer length (i.e. 'request_bufflen') less the number
		of bytes that are actually transferred. 'resid' is
		preset to 0 so an LLD can ignore it if it cannot detect
		underruns (overruns should be rare). If possible an LLD
		underruns (overruns should not be reported). An LLD
		should set 'resid' prior to invoking 'done'. The most
		interesting case is data transfers from a SCSI target
		device (e.g. READs) that underrun.

arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@

		memory@0 {
		device_type = "memory";
		reg = <0x00000000 0x08000000>;
		reg = <0x00000000 0x08000000>,
		<0x88000000 0x08000000>;
		};

		gpio-keys {

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -46,3 +46,16 @@
		};
		};
		};

		&gmac0 {
		phy-mode = "rgmii";
		phy-handle = <&bcm54210e>;

		mdio {
		/delete-node/ switch@1e;

		bcm54210e: ethernet-phy@0 {
		reg = <0>;
		};
		};
		};

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -83,3 +83,16 @@
		};
		};
		};

		&gmac0 {
		phy-mode = "rgmii";
		phy-handle = <&bcm54210e>;

		mdio {
		/delete-node/ switch@1e;

		bcm54210e: ethernet-phy@0 {
		reg = <0>;
		};
		};
		};