Unverified Commit 316ca9c3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!592 Backport 5.10.150 LTS 

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

Conflicts:

Already merged(19):
f039b43cbaea inet: fully convert sk->sk_rx_dst to RCU rules
45c33966759e mm: hugetlb: fix UAF in hugetlb_handle_userfault
c378c479c517 io_uring/af_unix: defer registered files gc to io_uring release
67cbc8865a66 io_uring: correct pinned_vm accounting
904f881b5736 arm64: topology: fix possible overflow in amu_fie_setup()
dbcca76435a6 HID: roccat: Fix use-after-free in roccat_read()
484400d433ca r8152: Rate limit overflow messages
d88b88514ef2 crypto: hisilicon/zip - fix mismatch in get/set sgl_sge_nr
657de36c72f5 arm64: ftrace: fix module PLTs with mcount
29f50bcf0f8b net: mvpp2: fix mvpp2 debugfs leak
6cc0e2afc6a1 bnx2x: fix potential memory leak in bnx2x_tpa_stop()
2a1d03632085 mISDN: fix use-after-free bugs in l1oip timer handlers
0cf6c09dafee ring-buffer: Fix race between reset page and reading page
fbb0e601bd51 ext4: ext4_read_bh_lock() should submit IO if the buffer isn't uptodate
483831ad0440 ext4: fix check for block being out of directory size
f34ab9516276 ext4: fix null-ptr-deref in ext4_write_info
e50472949604 fbdev: smscufx: Fix use-after-free in ufx_ops_open()
7d551b7d6114 block: fix inflight statistics of part0
6b7ae4a904a4 quota: Check next/prev free block number after reading from quota file

Context conflict(1):
c13d0d2f5a48 usb: host: xhci-plat: suspend and resume clocks

Total patches: 389 - 19 = 370 
 
Link:https://gitee.com/openeuler/kernel/pulls/592

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 6bf61fdd 15bbc3f6

Documentation/ABI/testing/sysfs-bus-iio

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ Description: 
		Raw capacitance measurement from channel Y. Units after

		application of scale and offset are nanofarads.



What:		/sys/.../iio:deviceX/in_capacitanceY-in_capacitanceZ_raw

What:		/sys/.../iio:deviceX/in_capacitanceY-capacitanceZ_raw

KernelVersion:	3.2

Contact:	linux-iio@vger.kernel.org

Description:

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -818,12 +818,12 @@ endif 


# Initialize all stack variables with a zero value.

ifdef CONFIG_INIT_STACK_ALL_ZERO

# Future support for zero initialization is still being debated, see

# https://bugs.llvm.org/show_bug.cgi?id=45497. These flags are subject to being

# renamed or dropped.

KBUILD_CFLAGS	+= -ftrivial-auto-var-init=zero

ifdef CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER

# https://github.com/llvm/llvm-project/issues/44842

KBUILD_CFLAGS	+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang

endif

endif



# While VLAs have been removed, GCC produces unreachable stack probes

# for the randomize_kstack_offset feature. Disable it for all compilers.

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1833,7 +1833,6 @@ config CMDLINE 
choice

	prompt "Kernel command line type" if CMDLINE != ""

	default CMDLINE_FROM_BOOTLOADER

	depends on ATAGS



config CMDLINE_FROM_BOOTLOADER

	bool "Use bootloader kernel arguments if available"

arch/arm/boot/dts/armada-385-turris-omnia.dts

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ 
		marvell,function = "spi0";

	};



	spi0cs1_pins: spi0cs1-pins {

	spi0cs2_pins: spi0cs2-pins {

		marvell,pins = "mpp26";

		marvell,function = "spi0";

	};
@@ -342,7 +342,7 @@ 
		};

	};



	/* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */

	/* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */

};



&uart0 {

arch/arm/boot/dts/exynos4412-midas.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ 
		clocks = <&camera 1>;

		clock-names = "extclk";

		samsung,camclk-out = <1>;

		gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;

		gpios = <&gpm1 6 GPIO_ACTIVE_LOW>;



		port {

			is_s5k6a3_ep: endpoint {