tree 12592c635ee5e7557557216b07dcab17d6c77c3a
parent 99a256590671fc884c3922d15b7668a37fe95d50
parent 8b24c7edc2f285b2eff7af7dcf02f752ae03b5b6
author COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1625735475 -0700
committer COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1625735476 -0700

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

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

Christian König (1):
      drm/nouveau: fix dma_address check for CPU/GPU sync

Johannes Berg (1):
      gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP

ManYi Li (1):
      scsi: sr: Return appropriate error code when disk is ejected

Mark Bloch (1):
      RDMA/mlx5: Block FDB rules when not in switchdev mode

Sasha Levin (1):
      Linux 5.4.130

YueHaibing (1):
      x86/efi: remove unused variables

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

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