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

!2865 Backport 5.10.181 - 5.10.182 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
issue: https://gitee.com/openeuler/kernel/issues/I8GJZJ
Backport 5.10.181 - 5.10.182 LTS patches from upstream

Conflicts:

context confilict(1):  
94ec1a44e843: iommu/arm-smmu-v3: Acknowledge pri/event queue overflow if any
 
Already merged(10):
449391400960: net: deal with most data-races in sk_wait_event()
f4a371d3f5a7: ipvlan:Fix out-of-bounds caused by unclear skb->cb
5c23f6da62f7: memstick: r592: Fix UAF bug in r592_remove due to race condition
e0e7faee3a7d: scsi: lpfc: Prevent lpfc_debugfs_lockstat_write() buffer overflow
aba74ad99870: net: hns3: fix sending pfc frames after reset issue
0cefa4215243: net: hns3: fix reset delay time to avoid configuration timeout
047f618d198e: writeback, cgroup: remove extra percpu_ref_exit()
f5bf8e3ca13e:  net/sched: act_mirred: better wording on protection against excessive stack growth
532451037863: act_mirred: use the backlog for nested calls to mirred ingress
2218752325a9: binder: fix UAF caused by faulty buffer cleanup

Rejected(5):
295e07a76bf3: xfrm: don't check the default policy if the policy allows the packet
bba7ebe10baf: net/sched: act_mirred: refactor the handle of xmit
d4a5e6ae9967: x86/mm: Avoid incomplete Global INVLPG flushes
4a8980cb2a7c: x86/cpu: Add Raptor Lake to Intel family
18c9cf463337: x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define

Kabi broken(9):
7d8f5ccc826b: firmware: arm_sdei: Fix sleep from invalid context BUG
812dcc533c31: KVM: arm64: Link position-independent string routines into .hyp.text
ba66851aba80: ipvs: Update width of source for ip_vs_sync_conn_options
e7fd68abbba3: tcp: fix possible sk_priority leak in tcp_v4_send_reset()
a9ef8b258988: ipv4/tcp: do not use per netns ctl sockets
788791990d74: net: Find dst with sk's xfrm policy not ctl_sk
12cb97ed85fb: regulator: Add regmap helper for ramp-delay setting
b3a9c4081db9: regulator: pca9450: Convert to use regulator_set_ramp_delay_regmap
860ad704e450: regulator: pca9450: Fix BUCK2 enable_mask



Total patches: 233 - 10 - 5 - 9 = 209 
 
Link:https://gitee.com/openeuler/kernel/pulls/2865

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7188c2d1 72ca2dfb

Documentation/devicetree/bindings/usb/cdns,usb3.yaml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ properties: 
    description:

      size of memory intended as internal memory for endpoints

      buffers expressed in KB

    $ref: /schemas/types.yaml#/definitions/uint32

    $ref: /schemas/types.yaml#/definitions/uint16



  cdns,phyrst-a-enable:

    description: Enable resetting of PHY if Rx fail is detected

arch/arm/boot/dts/stm32mp15-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ 
		};

	};



	sai2a_sleep_pins_c: sai2a-2 {

	sai2a_sleep_pins_c: sai2a-sleep-2 {

		pins {

			pinmux = <STM32_PINMUX('D', 13, ANALOG)>, /* SAI2_SCK_A */

				 <STM32_PINMUX('D', 11, ANALOG)>, /* SAI2_SD_A */

arch/arm/mach-sa1100/jornada720_ssp.c

+4 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/**

/*

 *  arch/arm/mac-sa1100/jornada720_ssp.c

 *

 *  Copyright (C) 2006/2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
@@ -26,6 +26,7 @@ static unsigned long jornada_ssp_flags; 


/**

 * jornada_ssp_reverse - reverses input byte

 * @byte: input byte to reverse

 *

 * we need to reverse all data we receive from the mcu due to its physical location

 * returns : 01110111 -> 11101110
@@ -46,6 +47,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse); 


/**

 * jornada_ssp_byte - waits for ready ssp bus and sends byte

 * @byte: input byte to transmit

 *

 * waits for fifo buffer to clear and then transmits, if it doesn't then we will

 * timeout after <timeout> rounds. Needs mcu running before its called.
@@ -77,6 +79,7 @@ EXPORT_SYMBOL(jornada_ssp_byte); 


/**

 * jornada_ssp_inout - decide if input is command or trading byte

 * @byte: input byte to send (may be %TXDUMMY)

 *

 * returns : (jornada_ssp_byte(byte)) on success

 *         : %-ETIMEDOUT on timeout failure

arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -98,11 +98,17 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		ethphy: ethernet-phy@4 {

		ethphy: ethernet-phy@4 { /* AR8033 or ADIN1300 */

			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <4>;

			reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;

			reset-assert-us = <10000>;

			/*

			 * Deassert delay:

			 * ADIN1300 requires 5ms.

			 * AR8033   requires 1ms.

			 */

			reset-deassert-us = <20000>;

		};

	};

};

arch/arm64/boot/dts/qcom/msm8996.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -1771,8 +1771,11 @@ 
				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;

				phys = <&hsusb_phy1>, <&ssusb_phy_0>;

				phy-names = "usb2-phy", "usb3-phy";

				snps,hird-threshold = /bits/ 8 <0>;

				snps,dis_u2_susphy_quirk;

				snps,dis_enblslpm_quirk;

				snps,is-utmi-l1-suspend;

				tx-fifo-resize;

			};

		};