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: baikal/aarch64/sdk6.1~4684
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=acff8478280422627a9f80ac45e4c3479b004037;p=kernel.git

Merge tag 'ata-5.17-rc4-2' of git://git.kernel.org/pub/scm/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
---

acff8478280422627a9f80ac45e4c3479b004037