tree b2b3827cb30a3a9054bee237a1dd54a49ea665a8
parent 6a86e30a2a3cb548b3b2ee07a9b9e9b5555f7132
parent 3a7dc5b4cfbdfd8da37cb0e54f439d84cf5a5123
author COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1632992657 -0700
committer COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1632992658 -0700

merge-upstream/v5.4.150 from branch/tag: upstream/v5.4.150 into branch: main-R85-13310.B-cos-5.4

Changelog:
-------------------------------------------------------------

Andreas Larsson (1):
      sparc32: page align size in arch_dma_alloc

Andy Shevchenko (1):
      platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()

Antoine Tenart (1):
      thermal/drivers/int340x: Do not set a wrong tcc offset on resume

Anton Eidelman (1):
      nvme-multipath: fix ANA state updates when a namespace is not present

Aya Levin (1):
      net/mlx4_en: Don't allow aRFS for encapsulated packets

Baokun Li (1):
      scsi: iscsi: Adjust iface sysfs attr detection

Bixuan Cui (1):
      bpf: Add oversize check before call kvcalloc()

Carlo Lobrano (1):
      USB: serial: option: add Telit LN920 compositions

Christoph Hellwig (1):
      md: fix a lock order reversal in md_alloc

Claudiu Manoil (1):
      enetc: Fix illegal access when reading affinity_hint

Dan Carpenter (6):
      usb: gadget: r8a66597: fix a loop in set_feature()
      usb: musb: tusb6010: uninitialized data in tusb_fifo_write_unaligned()
      mcb: fix error handling in mcb_alloc_bus()
      thermal/core: Potential buffer overflow in thermal_build_list_of_policies()
      cifs: fix a sign extension bug
      scsi: lpfc: Use correct scnprintf() limit

Dan Li (1):
      arm64: Mark __stack_chk_guard as __ro_after_init

David Howells (1):
      afs: Fix incorrect triggering of sillyrename on 3rd-party invalidation

Dmitry Bogdanov (1):
      scsi: qla2xxx: Restore initiator in dual mode

Gao Xiang (1):
      erofs: fix up erofs_lookup tracepoint

Greg Kroah-Hartman (1):
      Linux 5.4.150

Guenter Roeck (5):
      m68k: Double cast io functions to unsigned long
      compiler.h: Introduce absolute_pointer macro
      net: i825xx: Use absolute_pointer for memcpy from fixed memory location
      alpha: Declare virt_to_phys and virt_to_bus parameter as pointer to volatile
      net: 6pack: Fix tx timeout and slot time

Helge Deller (1):
      parisc: Use absolute_pointer() to define PAGE0

Jan Beulich (1):
      xen/x86: fix PV trap handling on secondary processors

Jesper Nilsson (1):
      net: stmmac: allow CSR clock of 300MHz

Jiapeng Chong (1):
      fpga: machxo2-spi: Fix missing error code in machxo2_write_complete()

Jiri Slaby (1):
      tty: synclink_gt, drop unneeded forward declarations

Johan Hovold (3):
      USB: cdc-acm: fix minor-number release
      staging: greybus: uart: fix tty use after free
      net: hso: fix muxed tty registration

Juergen Gross (2):
      xen/balloon: use a kernel thread instead a workqueue
      xen/balloon: fix balloon kthread freezing

Julian Sikorski (1):
      Re-enable UAS for LaCie Rugged USB3-FW with fk quirk

Kaige Fu (1):
      irqchip/gic-v3-its: Fix potential VPE leak on error

Karsten Graul (1):
      net/smc: add missing error check in smc_clc_prfx_set()

Kishon Vijay Abraham I (2):
      usb: core: hcd: Add support for deferring roothub registration
      xhci: Set HCD flag to defer primary roothub registration

Krzysztof Kozlowski (2):
      USB: serial: mos7840: remove duplicated 0xac24 device ID
      USB: serial: option: remove duplicate USB device ID

Kunihiko Hayashi (1):
      gpio: uniphier: Fix void functions to remove return value

Li Jinlin (1):
      blk-cgroup: fix UAF by grabbing blkcg lock before destroying blkg pd

Linus Torvalds (4):
      sparc: avoid stringop-overread errors
      qnx4: avoid stringop-overread errors
      spi: Fix tegra20 build with CONFIG_PM=n
      qnx4: work around gcc false positive warning bug

Michael Chan (1):
      bnxt_en: Fix TX timeout when TX ring size is set to the smallest

Minas Harutyunyan (2):
      usb: dwc2: gadget: Fix ISOC flow for BDMA and Slave
      usb: dwc2: gadget: Fix ISOC transfer complete handling for DDMA

Ondrej Zary (1):
      usb-storage: Add quirk for ScanLogic SL11R-IDE older than 2.6c

Pali Rohár (2):
      serial: mvebu-uart: fix driver's tx_empty callback
      arm64: dts: marvell: armada-37xx: Extend PCIe MEM space

Qu Wenruo (1):
      btrfs: prevent __btrfs_dump_space_info() to underflow its free space

Randy Dunlap (2):
      tty: synclink_gt: rename a conflicting function name
      irqchip/goldfish-pic: Select GENERIC_IRQ_CHIP to fix build

Sai Krishna Potthuri (1):
      EDAC/synopsys: Fix wrong value type assignment for edac_mode

Shai Malin (1):
      qed: rdma - don't wait for resources under hw error recovery flow

Slark Xiao (1):
      USB: serial: option: add device id for Foxconn T99W265

Steve French (1):
      cifs: fix incorrect check for null pointer in header_assemble

Todd Kjos (1):
      binder: make sure fd closes complete

Tom Rix (1):
      fpga: machxo2-spi: Return an error on failure

Tong Zhang (1):
      net: macb: fix use after free on rmmod

Uwe Brandt (1):
      USB: serial: cp210x: add ID for GW Instek GDM-834x Digital Multimeter

Wengang Wang (1):
      ocfs2: drop acl cache for directories too

Zhihao Cheng (1):
      blktrace: Fix uaf in blk_trace access after removing by sysfs

zhang kai (1):
      ipv6: delay fib6_sernum increase in fib6_add

BUG=b/201621049
TEST=tryjob, validation and K8s e2e
RELEASE_NOTE=Updated the Linux kernel to v5.4.150.

Signed-off-by: COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com>
Change-Id: I07f701fc46e2b70ec0c95f1f17a793b8ed991660