tree 38e162b625ec779dd1add745371d647b65d17b85
parent ec9d8ab886d3866e3f50e78b0e778efeac868010
parent a09a52277207fa79fc1aa7c32be6035c264a79c4
author COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1625736137 -0700
committer COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1625736138 -0700

merge-upstream/v5.10.48 from branch/tag: upstream/v5.10.48 into branch: cos-5.10

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

Loic Poulain (1):
      gpio: mxc: Fix disabled interrupt wake-up support

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.10.48

Sean Christopherson (1):
      Revert "KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack"

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

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