Unverified Commit b6ec8609 authored Jun 18, 2024 by openeuler-ci-bot Committed by Gitee Jun 18, 2024

!9010 Backport 6.6.31&6.6.32 LTS patches from upstream

Merge Pull Request from: @anred 
 
Backport linux-6.6.31-6.6.32 LTS patches from upstream.

total commits(412)

tag commits(2)
Linux 6.6.32
Linux 6.6.31

Already merged(15)
bpf: Add missing BPF_LINK_TYPE invocations
mm: use memalloc_nofs_save() in page_cache_ra_order()
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
net: hns3: fix kernel crash when devlink reload during initialization
net: hns3: fix port vlan filter not disabled issue
net: hns3: use appropriate barrier function after setting a bit value
net: hns3: release PTP resources if pf initialization failed
net: hns3: change type of numa_node_mask as nodemask_t
net: hns3: direct return when receive a unknown mailbox message
net: hns3: using user configure after hardware reset
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
block: fix overflow in blk_ioctl_discard()
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()

context confilict(2)
mm/userfaultfd: reset ptes when close() for wr-protected ones
ksmbd: fix potencial out-of-bounds when buffer offset is invalid

kabi broken(1)
xfrm: Preserve vlan tags for transport mode software GRO

392 + 15 + 2 + 2 + 1 = 412

Build and boot test passed for arm64 & x86. 
 
Link:https://gitee.com/openeuler/kernel/pulls/9010

 

Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parents cd2b95c3 dea2ab46

Documentation/ABI/stable/sysfs-block

+10 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,16 @@ Description:
		devices that support receiving integrity metadata.


		What: /sys/block/<disk>/partscan
		Date: May 2024
		Contact: Christoph Hellwig <hch@lst.de>
		Description:
		The /sys/block/<disk>/partscan files reports if partition
		scanning is enabled for the disk. It returns "1" if partition
		scanning is enabled, or "0" if not. The value type is a 32-bit
		unsigned integer, but only "0" and "1" are valid values.


		What: /sys/block/<disk>/<partition>/alignment_offset
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>

Documentation/admin-guide/hw-vuln/core-scheduling.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -67,8 +67,8 @@ arg4:
		will be performed for all tasks in the task group of ``pid``.

		arg5:
		userspace pointer to an unsigned long for storing the cookie returned by
		``PR_SCHED_CORE_GET`` command. Should be 0 for all other commands.
		userspace pointer to an unsigned long long for storing the cookie returned
		by ``PR_SCHED_CORE_GET`` command. Should be 0 for all other commands.

		In order for a process to push a cookie to, or pull a cookie from a process, it
		is required to have the ptrace access mode: `PTRACE_MODE_READ_REALCREDS` to the

Documentation/admin-guide/mm/damon/usage.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,7 @@ pages of all memory cgroups except ``/having_care_already``.::
		# # further filter out all cgroups except one at '/having_care_already'
		echo memcg > 1/type
		echo /having_care_already > 1/memcg_path
		echo N > 1/matching
		echo Y > 1/matching

		Note that ``anon`` and ``memcg`` filters are currently supported only when
		``paddr`` `implementation <sysfs_contexts>` is being used.

Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ allOf:
		properties:
		compatible:
		contains:
		const: maxim,max30100
		const: maxim,max30102
		then:
		properties:
		maxim,green-led-current-microamp: false

Documentation/devicetree/bindings/net/mediatek,net.yaml

+2 −20

Original line number	Diff line number	Diff line
		@@ -337,8 +337,8 @@ allOf:
		minItems: 4

		clocks:
		minItems: 34
		maxItems: 34
		minItems: 24
		maxItems: 24

		clock-names:
		items:
		@@ -351,18 +351,6 @@ allOf:
		- const: ethwarp_wocpu1
		- const: ethwarp_wocpu0
		- const: esw
		- const: netsys0
		- const: netsys1
		- const: sgmii_tx250m
		- const: sgmii_rx250m
		- const: sgmii2_tx250m
		- const: sgmii2_rx250m
		- const: top_usxgmii0_sel
		- const: top_usxgmii1_sel
		- const: top_sgm0_sel
		- const: top_sgm1_sel
		- const: top_xfi_phy0_xtal_sel
		- const: top_xfi_phy1_xtal_sel
		- const: top_eth_gmii_sel
		- const: top_eth_refck_50m_sel
		- const: top_eth_sys_200m_sel
		@@ -375,16 +363,10 @@ allOf:
		- const: top_netsys_sync_250m_sel
		- const: top_netsys_ppefb_250m_sel
		- const: top_netsys_warp_sel
		- const: wocpu1
		- const: wocpu0
		- const: xgp1
		- const: xgp2
		- const: xgp3

		mediatek,sgmiisys:
		minItems: 2
		maxItems: 2

		patternProperties:
		"^mac@[0-1]$":
		type: object