diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-10 10:26:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-10 10:26:28 -0700 |
| commit | f8693b3eb59f9055edca86b0789fd6593a57edf4 (patch) | |
| tree | 21651916aa987401cad4e7fb6785e0d0bb6fb7b0 /kernel/kexec.c | |
| parent | 8df2a0a6da450b0fc28f1fed110817c1d98b84c2 (diff) | |
| parent | 7667e63c8af90e287f9e2d070599024cbabe63f5 (diff) | |
Merge tag 'libata-5.7-2020-04-09' of git://git.kernel.dk/linux-block
Pull libata fixes from Jens Axboe:
"A few followup changes/fixes for libata:
- PMP removal fix (Kai-Heng)
- Add remapped NVMe device attribute to sysfs (Kai-Heng)
- Remove redundant assignment (Colin)
- Add yet another Comet Lake ID (Jian-Hong)"
* tag 'libata-5.7-2020-04-09' of git://git.kernel.dk/linux-block:
ahci: Add Intel Comet Lake PCH RAID PCI ID
ata: ahci: Add sysfs attribute to show remapped NVMe device count
ata: ahci-imx: remove redundant assignment to ret
libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set
Diffstat (limited to 'kernel/kexec.c')
0 files changed, 0 insertions, 0 deletions