diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-27 11:13:18 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-27 11:13:18 -0800 |
commit | 0f710a5572ea3a0fec36ad0b613f72144d99e830 (patch) | |
tree | 0c4f217ec5c04f9df2170fdc35b6c371d0d691a3 /net/ipv4/ipconfig.c | |
parent | 8ae40a6951a72c59f2f6a0b721ce0e43bbcffcab (diff) | |
parent | bf0e5013bc2dcac205417e1252205dca39dfc005 (diff) | |
download | linux-0f710a5572ea3a0fec36ad0b613f72144d99e830.tar.bz2 |
Merge tag 'libata-5.5-20191226' of git://git.kernel.dk/linux-block
Pull libata fixes from Jens Axboe:
"Two things in here:
- First half of a series that fixes ahci_brcm, also marked for
stable. The other part of the series is going into 5.6 (Florian)
- sata_nv regression fix that is also marked for stable (Sascha)"
* tag 'libata-5.5-20191226' of git://git.kernel.dk/linux-block:
ata: ahci_brcm: Add missing clock management during recovery
ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE
ata: ahci_brcm: Fix AHCI resources management
ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys()
libata: Fix retrieving of active qcs
Diffstat (limited to 'net/ipv4/ipconfig.c')
0 files changed, 0 insertions, 0 deletions