tree de8849be741b1795617167b2cd5072d27a703af0
parent ea29315d79543b3a80daf75380b949c7a575cba8
parent 84d5d3c9d3fbcee10bc16d3a3316af9a924c91c6
author COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1615453213 -0800
committer COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1615453214 -0800

merge-upstream/v5.4.104 from branch/tag: upstream/v5.4.104 into branch: main-R89-cos-5.4

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

Antonio Borneo (1):
      usbip: tools: fix build error for multiple definition

Ard Biesheuvel (1):
      crypto - shash: reduce minimum alignment of shash_desc structure

Chen Jun (1):
      ftrace: Have recordmcount use w8 to read relp->r_info in arm64_is_fake_mcount

Colin Ian King (1):
      ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits

Dan Carpenter (2):
      btrfs: validate qgroup inherit for SNAP_CREATE_V2 ioctl
      rsxx: Return -EFAULT if copy_to_user() fails

David Sterba (1):
      btrfs: raid56: simplify tracking of Q stripe presence

Filipe Manana (1):
      btrfs: fix warning when creating a directory with smack enabled

Greg Kroah-Hartman (1):
      Linux 5.4.104

Heiner Kallweit (1):
      r8169: fix resuming from suspend on RTL8105e if machine runs on battery

Ira Weiny (1):
      btrfs: fix raid6 qstripe kmap

Jarkko Sakkinen (1):
      tpm, tpm_tis: Decorate tpm_get_timeouts() with request_locality()

Julian Braha (1):
      RDMA/rxe: Fix missing kconfig dependency on CRYPTO

Kevin Wang (1):
      drm/amdgpu: fix parameter error of RREG32_PCIE() in amdgpu_regs_pcie

Lukasz Majczak (1):
      tpm, tpm_tis: Decorate tpm_tis_gen_interrupt() with request_locality()

Mikulas Patocka (1):
      dm bufio: subtract the number of initial sectors in dm_bufio_get_device_size

Milan Broz (1):
      dm verity: fix FEC for RS roots unaligned to block size

Nikolay Borisov (2):
      btrfs: free correct amount of space in btrfs_delayed_inode_reserve_metadata
      btrfs: unlock extents in btrfs_zero_range in case of quota reservation errors

Pierre-Louis Bossart (1):
      ALSA: hda: intel-nhlt: verify config type

Rafael J. Wysocki (1):
      PM: runtime: Update device status before letting suppliers suspend

Timothy E Baldwin (1):
      arm64: ptrace: Fix seccomp of traced syscall -1 (NO_SYSCALL)

YueHaibing (1):
      IB/mlx5: Add missing error code

BUG=b/182342608
TEST=tryjob, validation and K8s e2e
RELEASE_NOTE=Updated the Linux kernel to upstream/v5.4.104.

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