Unverified Commit de22a0cb authored Aug 17, 2023 by openeuler-ci-bot Committed by Gitee Aug 17, 2023

!1793 Backport 5.10.166 - 5.10.167 LTS patches from upstream.

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

Backport 5.10.166 - 5.10.167 LTS patches from upstream.

Conflicts:

Already merged(14):
7b4516ba56f1:  HID: intel_ish-hid: Add check for ishtp_dma_tx_map
c60fe70078d6:  net/sched: sch_taprio: fix possible use-after-free
5dc3469a1170:  HID: check empty report_list in hid_validate_values()
20fd4598762e:  HID: check empty report_list in bigben_probe()
5f10f7efe0fc:  nvme-pci: fix timeout request state check
cf9a2ce0383e:  net/sched: sch_taprio: do not schedule in taprio_reset()
6ef652f35dcf:  sctp: fail if no bound addresses can be used for a given scope
802fd7623e9e:  wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oid
e34a965f771f:  l2tp: Serialize access to sk_user_data with sk_callback_lock
5b209b8c99d4:  l2tp: Don't sleep and disable BH under writer-side sk_callback_lock
52249c2168af:  scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id
e6226917f4cf:  sysctl: add a new register_sysctl_init() interface 
a1c0263f1eb4:  bpf: Skip task with pid=1 in send_signal_common()
d744c03c04a7:  ACPI: processor idle: Practically limit "Dummy wait" workaround to old Intel systems

Rejected(9):
d9c740c765e5:  exit: Add and use make_task_dead.
b2c178f31162:  objtool: Add a missing comma to avoid string concatenation
63d77c559678:  hexagon: Fix function name in die() 
648d8b8c4938:  h8300: Fix build errors from do_exit() to make_task_dead() transition
6d971830da31:  csky: Fix function name in csky_alignment() and die()
de586785b981:  exit: Put an upper limit on how often we can oops
7cffbcd68f1c:  exit: Expose "oops_count" to sysfs
530cdae5c2b2:  exit: Allow oops_limit to be disabled
b98a8b731bd2:  exit: Use READ_ONCE() for all oops/warn limit reads

Kabi broken(1):
6bc564f3fec0 scsi: iscsi: Fix multiple iSCSI session unbind events sent to userspace

Total patches: 151 - 14 - 9 - 1= 127 
 
Link:https://gitee.com/openeuler/kernel/pulls/1793

 

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

parents 16b86bfe e2b979a2

Documentation/ABI/testing/sysfs-kernel-warn_count

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/warn_count
		Date: November 2022
		KernelVersion: 6.2.0
		Contact: Linux Kernel Hardening List <linux-hardening@vger.kernel.org>
		Description:
		Shows how many times the system has Warned since last boot.

Documentation/admin-guide/sysctl/kernel.rst

+10 −0

Original line number	Diff line number	Diff line
		@@ -1490,6 +1490,16 @@ entry will default to 2 instead of 0.
		2 Unprivileged calls to ``bpf()`` are disabled
		= =============================================================


		warn_limit
		==========

		Number of kernel warnings after which the kernel should panic when
		``panic_on_warn`` is not set. Setting this to 0 disables checking
		the warning count. Setting this to 1 has the same effect as setting
		``panic_on_warn=1``. The default value is 0.


		watchdog
		========

arch/arm/boot/dts/imx53-ppd.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@
		scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
		status = "okay";

		i2c-switch@70 {
		i2c-mux@70 {
		compatible = "nxp,pca9547";
		#address-cells = <1>;
		#size-cells = <0>;

arch/arm/boot/dts/imx6qdl-gw560x.dtsi

+0 −1

Original line number	Diff line number	Diff line
		@@ -634,7 +634,6 @@
		&uart1 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_uart1>;
		uart-has-rtscts;
		rts-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
		status = "okay";
		};

arch/arm/boot/dts/imx6ul-pico-dwarf.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@
		};

		&i2c2 {
		clock_frequency = <100000>;
		clock-frequency = <100000>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_i2c2>;
		status = "okay";