tree 73d8e0f858d702fb9d04a6e657ccddd6e5902a07
parent b51660d13b72dad9b1c5682edb63d97d5c8c4b79
parent fc944ddc0b4a019d4ece166909e65fa2a11c7e0e
author COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1614157109 -0800
committer Vaibhav Rustagi <vaibhavrustagi@google.com> 1614209143 +0000

merge-upstream/v5.4.100 from branch/tag: upstream/v5.4.100 into branch: cos-5.4

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

David Sterba (1):
      btrfs: fix backport of 2175bf57dc952 in 5.4.95

Greg Kroah-Hartman (1):
      Linux 5.4.100

Jan Beulich (8):
      Xen/x86: don't bail early from clear_foreign_p2m_mapping()
      Xen/x86: also check kernel mapping in set_foreign_p2m_mapping()
      Xen/gntdev: correct dev_bus_addr handling in gntdev_map_grant_pages()
      Xen/gntdev: correct error checking in gntdev_map_grant_pages()
      xen-blkback: don't "handle" error by BUG()
      xen-netback: don't "handle" error by BUG()
      xen-scsiback: don't "handle" error by BUG()
      xen-blkback: fix error handling in xen_blkbk_map()

Loic Poulain (1):
      net: qrtr: Fix port ID for control messages

Matwey V. Kornilov (1):
      media: pwc: Use correct device for DMA

Paolo Bonzini (1):
      KVM: SEV: fix double locking due to incorrect backport

Stefano Stabellini (1):
      xen/arm: don't ignore return errors from set_phys_to_machine

Wang Hai (1):
      net: bridge: Fix a warning when del bridge sysfs

BUG=b/181096381,b/181107277,b/181107516
TEST=tryjob, validation and K8s e2e
RELEASE_NOTE=Updated the Linux kernel to upstream/v5.4.100.

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