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

!1851 Backport 5.10.169 - 5.10.172 LTS patches from upstream 

Merge Pull Request from: @hitmoon 
 
issue: https://gitee.com/openeuler/kernel/issues/I7V9QX

Already merged(17):
eb8e9d8572d1 net/sched: tcindex: update imperfect hash filters respecting rcu
7ff0fdba8229 net: mpls: fix stale pointer if allocation fails during device rename
4fe9950815e1 net/sched: tcindex: search key must be 16 bits
6416c2108ba5 kvm: initialize all of the kvm_debugregs structure before sending it to userspace
1b0cafaae888 KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS
3d743415c6fb drm/i915/gvt: fix double free bug in split_2MB_gtt_entry
3b6ce54cfa2c uaccess: Add speculation barrier to copy_from_user()
4311ad1e7654 nbd: fix possible overflow on 'first_minor' in nbd_dev_add()
12e3119a8762 bpf: add missing header file include
2fd5059f4fdf neigh: make sure used and confirmed times are valid
3e4bbd1f38a8 net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues().
80653a6e6e28 vc_screen: don't clobber return value in vcs_read
1c44109c3094 md: Flush workqueue md_rdev_misc_wq in md_alloc()
0a4181b23acf drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init
87c647def389 drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling
08681391b84d io_uring: add missing lock in io_get_file_fixed
da24142b1ef9 io_uring: ensure that io_init_req() passes in the right issue_flags

Kabi broken(1):
c44e96d6c31a: Revert "net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"

Rejected(1):
e2bf52ff159d: net: Fix unwanted sign extension in netdev_stats_to_stats64()

Total patches: 104 - 17 - 1 - 1 = 85 
 
Link:https://gitee.com/openeuler/kernel/pulls/1851

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents becf443a 1007748b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3011,7 +3011,7 @@ F: drivers/net/ieee802154/atusb.h 
AUDIT SUBSYSTEM

M:	Paul Moore <paul@paul-moore.com>

M:	Eric Paris <eparis@redhat.com>

L:	linux-audit@redhat.com (moderated for non-subscribers)

L:	audit@vger.kernel.org

S:	Supported

W:	https://github.com/linux-audit

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git

arch/arm/boot/dts/rk3288.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1203,6 +1203,7 @@ 
		clock-names = "dp", "pclk";

		phys = <&edp_phy>;

		phy-names = "dp";

		power-domains = <&power RK3288_PD_VIO>;

		resets = <&cru SRST_EDP>;

		reset-names = "dp";

		rockchip,grf = <&grf>;

arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

+0 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
			linux,default-trigger = "heartbeat";

			gpios = <&rk805 1 GPIO_ACTIVE_LOW>;

			default-state = "on";

			mode = <0x23>;

		};



		user_led: led-1 {
@@ -99,7 +98,6 @@ 
			linux,default-trigger = "mmc1";

			gpios = <&rk805 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

			mode = <0x05>;

		};

	};

};

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later

/*

 * QorIQ FMan v3 10g port #2 device tree stub [ controller @ offset 0x400000 ]

 *

 * Copyright 2022 Sean Anderson <sean.anderson@seco.com>

 * Copyright 2012 - 2015 Freescale Semiconductor Inc.

 */



fman@400000 {

	fman0_rx_0x08: port@88000 {

		cell-index = <0x8>;

		compatible = "fsl,fman-v3-port-rx";

		reg = <0x88000 0x1000>;

		fsl,fman-10g-port;

	};



	fman0_tx_0x28: port@a8000 {

		cell-index = <0x28>;

		compatible = "fsl,fman-v3-port-tx";

		reg = <0xa8000 0x1000>;

		fsl,fman-10g-port;

	};



	ethernet@e0000 {

		cell-index = <0>;

		compatible = "fsl,fman-memac";

		reg = <0xe0000 0x1000>;

		fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;

		ptp-timer = <&ptp_timer0>;

		pcsphy-handle = <&pcsphy0>;

	};



	mdio@e1000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

		reg = <0xe1000 0x1000>;

		fsl,erratum-a011043; /* must ignore read errors */



		pcsphy0: ethernet-phy@0 {

			reg = <0x0>;

		};

	};

};

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later

/*

 * QorIQ FMan v3 10g port #3 device tree stub [ controller @ offset 0x400000 ]

 *

 * Copyright 2022 Sean Anderson <sean.anderson@seco.com>

 * Copyright 2012 - 2015 Freescale Semiconductor Inc.

 */



fman@400000 {

	fman0_rx_0x09: port@89000 {

		cell-index = <0x9>;

		compatible = "fsl,fman-v3-port-rx";

		reg = <0x89000 0x1000>;

		fsl,fman-10g-port;

	};



	fman0_tx_0x29: port@a9000 {

		cell-index = <0x29>;

		compatible = "fsl,fman-v3-port-tx";

		reg = <0xa9000 0x1000>;

		fsl,fman-10g-port;

	};



	ethernet@e2000 {

		cell-index = <1>;

		compatible = "fsl,fman-memac";

		reg = <0xe2000 0x1000>;

		fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;

		ptp-timer = <&ptp_timer0>;

		pcsphy-handle = <&pcsphy1>;

	};



	mdio@e3000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

		reg = <0xe3000 0x1000>;

		fsl,erratum-a011043; /* must ignore read errors */



		pcsphy1: ethernet-phy@0 {

			reg = <0x0>;

		};

	};

};