tree cc6f9c67b755a9547771549fc54afa78f1075d02
parent c3ee3a9e4fa6b1d249b5abff2d4c7dab5a47d522
parent c8ea23d5fa59f28302d4e3370c75d9c308e64410
author Linus Torvalds <torvalds@linux-foundation.org> 1644604951 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1644604951 -0800
mergetag object c8ea23d5fa59f28302d4e3370c75d9c308e64410
 type commit
 tag ata-5.17-rc4-2
 tagger Damien Le Moal <damien.lemoal@opensource.wdc.com> 1644584477 +0900
 
 ata fixes for 5.17-rc4
 
 A couple of additional fixes for 5.17-rc4:
 
 * Fix compilation warnings in the sata_fsl driver (powerpc), from me.
 
 * Disable TRIM commands on M88V29 devices as these commands are failing
   despite the device reporting it supports TRIM. From Zoltan.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQSRPv8tYSvhwAzJdzjdoc3SxdoYdgUCYgZe8wAKCRDdoc3SxdoY
 doAwAP42re55XPj2ZDxm3iZ3GwvDtg4UZ6A6YDOG4e1wiHCbQgEAjwb18nwkuldj
 1YU4hVwoSsjxcPYndXMQ3ZhD+Rxy9gA=
 =b45Z
 -----END PGP SIGNATURE-----

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