From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Jan 2022 08:22:11 +0000 (+0200)
Subject: Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemo... 
X-Git-Tag: baikal/mips/sdk6.1~6571
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=5695043298a4776669e5cf3f8d9ac140f97ab1f1;p=kernel.git

Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

Pull ATA fix from Damien Le Moal:
 "A single patch to fix a compilation error in the pata_octeon_cf driver
  (mips architecture), from me"

* tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: pata_octeon_cf: fix call to trace_ata_bmdma_stop()
---

5695043298a4776669e5cf3f8d9ac140f97ab1f1