Unverified Commit 57494e92 authored Feb 17, 2023 by openeuler-ci-bot Committed by Gitee Feb 17, 2023

!407 Backport 5.10.145 - 5.10.149 LTS

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

Conflicts:

Already merged(3):
9f267393b036 cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all()
06e194e1130c video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
e00582a36198 video: fbdev: i740fb: Error out if 'pixclock' equals zero

Context conflict(1):
f63ddf62d0c8 tools/include/uapi: Fix <asm/errno.h> for parisc and xtensa

Total patches: 39 - 3 = 36

Backport 5.10.146 LTS patches from upstream.

Conflicts:

Already merged(7):
958b0ee23f5a ext4: fix bug in extents parsing when eh_entries == 0 and eh_depth > 0
ab4a733874ea ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header
5d75fef3e61e netfilter: nfnetlink_osf: fix possible bogus match in nf_osf_find()
9a5d7e0acb41 netfilter: nf_conntrack_irc: Tighten matching on DCC message
e811a534ec2f xfs: fix up non-directory creation in SGID directories
a60babeb60ff KVM: SEV: add cache flush to solve SEV cache incoherency issues
3a26651a7856 USB: core: Fix RST error in hub.c

Context conflict(1):
abb560abdf47 vfio/type1: Prepare for batched pinning with struct vfio_batch

Total patches: 138 - 7 = 131

Backport 5.10.147 LTS patches from upstream.

Conflicts:

Already merged(1):
cce5dc03338e scsi: hisi_sas: Revert "scsi: hisi_sas: Limit max hw sectors for v3 HW"

Total patches: 51 - 1 = 50

Backport 5.10.148 LTS patches from upstream.

Conflicts:

Already merged(11):
58c0306d0bcd wifi: mac80211: fix crash in beacon protection for P2P-device
b0e5c5deb788 wifi: cfg80211: avoid nontransmitted BSS list corruption
6b9448450313 wifi: cfg80211: fix BSS refcounting bugs
a6408e0b694c wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
36b33c63515a scsi: stex: Properly zero out the passthrough command structure
1b257f97fec4 usb: mon: make mmapped memory read only
1e555c3ed1fc fs: fix UAF/GPF bug in nilfs_mdt_destroy
fce793a056c6 ALSA: pcm: oss: Fix race at SNDCTL_DSP_SYNC
aad4c997857f nilfs2: fix leak of nilfs_root in case of writer thread creation failure
21ee3cffed8f nilfs2: fix use-after-free bug of struct nilfs_root
3f840480e314 nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()

Total patches: 54 - 11 = 43

Backport 5.10.149 LTS patches from upstream.

Conflicts:

Already merged(1):
31ce5da48a84 wifi: mac80211: fix MBSSID parsing use-after-free

Total patches: 4 - 1 = 3

Summary: 36 + 131 + 50 + 43 + 3 = 263 
 
Link:https://gitee.com/openeuler/kernel/pulls/407

 

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

parents 96770856 e6e4784b

Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ Example:
		Use specific request line passing from dma
		For example, MMC request line is 5

		sdhci: sdhci@98e00000 {
		compatible = "moxa,moxart-sdhci";
		mmc: mmc@98e00000 {
		compatible = "moxa,moxart-mmc";
		reg = <0x98e00000 0x5C>;
		interrupts = <5 0>;
		clocks = <&clk_apb>;

Documentation/process/code-of-conduct-interpretation.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ the Technical Advisory Board (TAB) or other maintainers if you're
		uncertain how to handle situations that come up. It will not be
		considered a violation report unless you want it to be. If you are
		uncertain about approaching the TAB or any other maintainers, please
		reach out to our conflict mediator, Mishi Choudhary <mishi@linux.com>.
		reach out to our conflict mediator, Joanna Lee <joanna.lee@gesmer.com>.

		In the end, "be kind to each other" is really what the end goal is for
		everybody. We know everyone is human and we all fail at times, but the

arch/arm/boot/dts/am33xx-l4.dtsi

+1 −2

Original line number	Diff line number	Diff line
		@@ -1352,8 +1352,7 @@
		mmc1: mmc@0 {
		compatible = "ti,am335-sdhci";
		ti,needs-special-reset;
		dmas = <&edma_xbar 24 0 0
		&edma_xbar 25 0 0>;
		dmas = <&edma 24 0>, <&edma 25 0>;
		dma-names = "tx", "rx";
		interrupts = <64>;
		reg = <0x0 0x1000>;

arch/arm/boot/dts/integratorap.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@

		pci: pciv3@62000000 {
		compatible = "arm,integrator-ap-pci", "v3,v360epc-pci";
		device_type = "pci";
		#interrupt-cells = <1>;
		#size-cells = <2>;
		#address-cells = <3>;

arch/arm/boot/dts/moxart-uc7112lx.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@
		clocks = <&ref12>;
		};

		&sdhci {
		&mmc {
		status = "okay";
		};