diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-11 10:42:31 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-11 10:42:31 -0800 |
commit | 284fce0443329b641694894bd1757e4cda626c1f (patch) | |
tree | cc6f9c67b755a9547771549fc54afa78f1075d02 /block/blk-pm.c | |
parent | c3ee3a9e4fa6b1d249b5abff2d4c7dab5a47d522 (diff) | |
parent | c8ea23d5fa59f28302d4e3370c75d9c308e64410 (diff) |
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
Diffstat (limited to 'block/blk-pm.c')
0 files changed, 0 insertions, 0 deletions