Merge tag 'libata-5.15-2021-09-05' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Sep 2021 16:51:42 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Sep 2021 16:51:42 +0000 (09:51 -0700)
commiteebb4159a2bf660b545ecb6ee318179971d610a2
tree336bc6e42de8840af2c92eac43597e5a01fd56b2
parent60f8fbaa954452104a1914e21c5cc109f7bf276a
parent7a8526a5cd51cf5f070310c6c37dd7293334ac49
Merge tag 'libata-5.15-2021-09-05' of git://git.kernel.dk/linux-block

Pull libata fixes from Jens Axboe:
 "Fixes for queued trim on certain Samsung SSDs, in conjunction with
  certain ATI controllers"

* tag 'libata-5.15-2021-09-05' of git://git.kernel.dk/linux-block:
  libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
  libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs