From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jul 2021 17:56:47 +0000 (-0700)
Subject: Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block
X-Git-Tag: nvme-5.15-2021-08-18~79
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f6c5971bb78ee5c4b9659f2764e58c175b75638c;p=nvme.git

Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block

Pull libata fixlets from Jens Axboe:

 - A fix for PIO highmem (Christoph)

 - Kill HAVE_IDE as it's now unused (Lukas)

* tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block:
  arch: Kconfig: clean up obsolete use of HAVE_IDE
  libata: fix ata_pio_sector for CONFIG_HIGHMEM
---

f6c5971bb78ee5c4b9659f2764e58c175b75638c