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

!3085 Backport 5.10.185 - 5.10.187 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
issue: https://gitee.com/openeuler/kernel/issues/I8J4KH

Conflicts:

context confilict(1):  
c13573032b7be: arm64: Add missing Set/Way CMO encodings

Already merged(9):
4716c73b18856: io_uring: hold uring mutex around poll removal
1c004b379b032: Remove DECnet support from kernel
af6eaa57986e8: net/sched: cls_u32: Fix reference counter leak leading to overflow
a261589621764: cgroup: always put cset in cgroup_css_set_put_fork
c374552b54d6f: mm/memory_hotplug: extend offline_and_remove_memory() to handle more than one memory block
2d1c19597d1eb: media: dvb-core: Fix use-after-free due to race at dvb_register_device()
63608437a83dd: cgroup: Do not corrupt task iteration when rebinding subsystem
191b8f9b0e370: x86/cpu/amd: Move the errata checking functionality up
93df00f9d48d4: x86/cpu/amd: Add a Zenbleed fix

Rejected(5):
bf82668eb950e: net: Remove DECnet leftovers from flow.h.
a1b26dac8bc6b: media: dvbdev: Fix memleak in dvb_register_device
5c61c3945adf1: media: dvbdev: fix error logic at dvb_register_device()
f19a4818a92ae: netfilter: nftables: statify nft_parse_register()
9e8d927cfa564: netfilter: nf_tables: validate registers coming from userspace.

Kabi broken(4):
e1aa3fe3e282a: mm/pagealloc: sysctl: change watermark_scale_factor max limit to 30%
1ac6e9ee84285: sysctl: move some boundary constants from sysctl.c to sysctl_vals
a16209b96c2b5: xfrm: Treat already-verified secpath entries as optional
8b7454dd984a7: netfilter: nf_tables: hold mutex on netns pre_exit path
 
Total patches: 173 - 9 - 5  = 155 
 
Link:https://gitee.com/openeuler/kernel/pulls/3085

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d5c51d97 3c3ea65f

Documentation/core-api/kernel-api.rst

+2 −5
Original line number Diff line number Diff line
@@ -24,11 +24,8 @@ String Conversions 
.. kernel-doc:: lib/vsprintf.c

   :export:



.. kernel-doc:: include/linux/kernel.h

   :functions: kstrtol



.. kernel-doc:: include/linux/kernel.h

   :functions: kstrtoul

.. kernel-doc:: include/linux/kstrtox.h

   :functions: kstrtol kstrtoul



.. kernel-doc:: lib/kstrtox.c

   :export:

arch/arm/boot/dts/am57xx-cl-som-am57x.dts

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ 


		interrupt-parent = <&gpio1>;

		interrupts = <31 0>;

		pendown-gpio = <&gpio1 31 0>;

		pendown-gpio = <&gpio1 31 GPIO_ACTIVE_LOW>;





		ti,x-min = /bits/ 16 <0x0>;

arch/arm/boot/dts/at91sam9261ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
					compatible = "ti,ads7843";

					interrupts-extended = <&pioC 2 IRQ_TYPE_EDGE_BOTH>;

					spi-max-frequency = <3000000>;

					pendown-gpio = <&pioC 2 GPIO_ACTIVE_HIGH>;

					pendown-gpio = <&pioC 2 GPIO_ACTIVE_LOW>;



					ti,x-min = /bits/ 16 <150>;

					ti,x-max = /bits/ 16 <3830>;

arch/arm/boot/dts/imx7d-pico-hobbit.dts

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
		interrupt-parent = <&gpio2>;

		interrupts = <7 0>;

		spi-max-frequency = <1000000>;

		pendown-gpio = <&gpio2 7 0>;

		pendown-gpio = <&gpio2 7 GPIO_ACTIVE_LOW>;

		vcc-supply = <&reg_3p3v>;

		ti,x-min = /bits/ 16 <0>;

		ti,x-max = /bits/ 16 <4095>;

arch/arm/boot/dts/imx7d-sdb.dts

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
		pinctrl-0 = <&pinctrl_tsc2046_pendown>;

		interrupt-parent = <&gpio2>;

		interrupts = <29 0>;

		pendown-gpio = <&gpio2 29 GPIO_ACTIVE_HIGH>;

		pendown-gpio = <&gpio2 29 GPIO_ACTIVE_LOW>;

		touchscreen-max-pressure = <255>;

		wakeup-source;

	};