From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Nov 2021 17:45:34 +0000 (-0700)
Subject: Merge tag 'libata-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal... 
X-Git-Tag: v6.1-rc5~2766
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61f90a8e8068c1176593858df9daf02b430fb4d7;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'libata-5.16-rc1' of git://git./linux/kernel/git/dlemoal/libata

Pull libata updates from Damien Le Moal:

 - Remove duplicated AHCI adapter PCI device IDs (from Krzysztof)

 - Cleanup of device DMA state checking to consistantly use
   ata_dma_enabled() (from Reimar)

* tag 'libata-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  pata_radisys: fix checking of DMA state
  pata_optidma: fix checking of DMA state
  pata_amd: fix checking of DMA state
  pata_ali: fix checking of DMA state
  libata-scsi: fix checking of DMA state
  libata: fix checking of DMA state
  Add AHCI support for ASM1062+JBM575 cards
  ahci: remove duplicated PCI device IDs
---

61f90a8e8068c1176593858df9daf02b430fb4d7