Merge tag 'ata-5.17-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemo...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jan 2022 08:22:11 +0000 (10:22 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jan 2022 08:22:11 +0000 (10:22 +0200)
commitb087788c20aa959f83df989b31fdcc4182b2d067
tree34ceff45f55bf19ba84dcae5ff4a69239632857d
parent6bdfb259d6d66161011d1d618af190f52b6d57fd
parentb875b39e7373dcaccb19a600a52a956061c2c833
Merge tag 'ata-5.17-rc1-part2' of git://git./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()