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

!7128 Backport 5.10.206 LTS patches from upstream 

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

Conflicts:
Already merged(8):
294d66c35a4e  scsi: core: Add scsi_prot_ref_tag() helper
f230e6d4249b  scsi: core: Introduce scsi_get_sector()
d054858a9c9e  scsi: core: Make scsi_get_lba() return the LBA
df83ca8e986d  scsi: core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
f2d30198c053  scsi: core: Use a structure member to track the SCSI command submitter
9db5239d7533  scsi: core: Always send batch on reset or error handling command
0c54b79d1d9b  smb: client: fix OOB in smbCalcSize()
db1b14eec8c6  Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg

Extra merge（1）:
02f629bb460d  smb3: Replace smb2pdu 1-element arrays with flex-arrays

Total patches: 73 - 8 + 1 = 66 
 
Link:https://gitee.com/openeuler/kernel/pulls/7128

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e852b24b 4a91ccc7

Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml

+6 −4
Original line number Diff line number Diff line
@@ -14,9 +14,11 @@ allOf: 


properties:

  compatible:

    enum:

    items:

      - enum:

          - fsl,imx23-ocotp

          - fsl,imx28-ocotp

      - const: fsl,ocotp



  "#address-cells":

    const: 1
@@ -40,7 +42,7 @@ additionalProperties: false 
examples:

  - |

    ocotp: efuse@8002c000 {

        compatible = "fsl,imx28-ocotp";

        compatible = "fsl,imx28-ocotp", "fsl,ocotp";

        #address-cells = <1>;

        #size-cells = <1>;

        reg = <0x8002c000 0x2000>;

arch/arm/boot/dts/am33xx.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ 
					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>,

					<SYSC_IDLE_SMART_WKUP>;

			ti,sysc-delay-us = <2>;

			clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

arch/arm/mach-omap2/id.c

+5 −0
Original line number Diff line number Diff line
@@ -793,11 +793,16 @@ void __init omap_soc_device_init(void) 


	soc_dev_attr->machine  = soc_name;

	soc_dev_attr->family   = omap_get_family();

	if (!soc_dev_attr->family) {

		kfree(soc_dev_attr);

		return;

	}

	soc_dev_attr->revision = soc_rev;

	soc_dev_attr->custom_attr_group = omap_soc_groups[0];



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr->family);

		kfree(soc_dev_attr);

		return;

	}

arch/mips/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ config MACH_LOONGSON2EF 


config MACH_LOONGSON64

	bool "Loongson 64-bit family of machines"

	select ARCH_DMA_DEFAULT_COHERENT

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO
@@ -1377,7 +1376,6 @@ config CPU_LOONGSON64 
	select CPU_SUPPORTS_MSA

	select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT

	select CPU_MIPSR2_IRQ_VI

	select DMA_NONCOHERENT

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select MIPS_ASID_BITS_VARIABLE

arch/mips/include/asm/mach-loongson64/boot_param.h

+1 −2
Original line number Diff line number Diff line
@@ -117,8 +117,7 @@ struct irq_source_routing_table { 
	u64 pci_io_start_addr;

	u64 pci_io_end_addr;

	u64 pci_config_addr;

	u16 dma_mask_bits;

	u16 dma_noncoherent;

	u32 dma_mask_bits;

} __packed;



struct interface_info {