From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Feb 2022 18:42:31 +0000 (-0800)
Subject: Merge tag 'ata-5.17-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal... 
X-Git-Tag: v6.1-rc5~2024
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=284fce0443329b641694894bd1757e4cda626c1f;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'ata-5.17-rc4-2' of git://git./linux/kernel/git/dlemoal/libata

Pull ata fixes from Damien Le Moal:
 "A couple of additional fixes for 5.17-rc4:

   - Fix compilation warnings in the sata_fsl driver (powerpc) (me)

   - Disable TRIM commands on M88V29 devices as these commands are
     failing despite the device reporting it supports TRIM (Zoltan)"

* tag 'ata-5.17-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: libata-core: Disable TRIM on M88V29
  ata: sata_fsl: fix sscanf() and sysfs_emit() format strings
---

284fce0443329b641694894bd1757e4cda626c1f