tree 1657230b62b87ede5ea1cd22daa4c1c009c1971d
parent acece984078c1e1a59a5d965a39f89f2ab29b14f
parent faaca480fd5cd1976b6db743c43ac1f8d583de72
author COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1633856353 -0700
committer COS Kernel Merge Bot <cloud-image-merge-automation@prod.google.com> 1633856354 -0700

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

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

Anand K Mistry (1):
      perf/x86: Reset destroy callback on event init failure

Changbin Du (1):
      tools/vm/page-types: remove dependency on opt_file for idle page tracking

Dan Carpenter (1):
      ext2: fix sleeping in atomic bugs on error

Faizel K B (1):
      usb: testusb: Fix for showing the connection speed

Fares Mehanna (1):
      kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]

Greg Kroah-Hartman (1):
      Linux 5.4.152

Jan Beulich (1):
      xen-netback: correct success/error reporting for the SKB-with-fraglist case

Kate Hsuan (1):
      libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.

Li Zhijian (1):
      selftests: be sure to make khdr before other targets

Linus Torvalds (1):
      sparc64: fix pci_iounmap() when CONFIG_PCI is not set

Ming Lei (1):
      scsi: sd: Free scsi_disk device via put_device()

Rik van Riel (1):
      silence nfscache allocation warnings with kvzalloc

Sergey Senozhatsky (1):
      KVM: do not shrink halt_poll_ns below grow_start

Shuah Khan (1):
      selftests:kvm: fix get_warnings_count() ignoring fscanf() return warn

Vladimir Oltean (1):
      net: mdio: introduce a shutdown method to mdio device drivers

Wen Xiong (1):
      scsi: ses: Retry failed Send/Receive Diagnostic commands

Yang Yingliang (1):
      usb: dwc2: check return value after calling platform_get_resource()

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

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