diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-13 14:29:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-13 14:29:21 -0700 |
| commit | a3b84248628df52c39c8724fb69da1ea0f2c0dc7 (patch) | |
| tree | da664789ca89f072f33c5248dc67b1305cfb72a6 /drivers/net/vrf.c | |
| parent | cf60528f8ab805ba03e21ce4ce6ab11647cede9b (diff) | |
| parent | 3943af9d01e94330d0cfac6fccdbc829aad50c92 (diff) | |
Merge tag 'pci-v5.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- Add a DMA alias quirk for another Marvell SATA device (Andre
Przywara)
- Fix a pciehp regression that broke safe removal of devices (Sergey
Miroshnichenko)
* tag 'pci-v5.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: pciehp: Ignore Link State Changes after powering off a slot
PCI: Add function 1 DMA alias quirk for Marvell 9170 SATA controller
Diffstat (limited to 'drivers/net/vrf.c')
0 files changed, 0 insertions, 0 deletions