diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 15:05:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 15:05:02 -0700 |
| commit | 38da0d6888a6bccd3ae93227aa9f29537f8bd5f9 (patch) | |
| tree | 64c7c1d008460f05b579110a7e40b6c796fb1578 /fs/xfs/xfs_inode.h | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal (diff) | |
| parent | Merge branch 'pci/aer-squash' (diff) | |
| download | linux-dev-38da0d6888a6bccd3ae93227aa9f29537f8bd5f9.tar.xz linux-dev-38da0d6888a6bccd3ae93227aa9f29537f8bd5f9.zip | |
Merge tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull more PCI updates from Bjorn Helgaas:
- squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)
- collect all native hardware drivers under drivers/pci/controller/
(Shawn Lin)
* tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/AER: Use "PCI Express" consistently in Kconfig text
PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
PCI/AER: Squash Kconfig.debug into Kconfig
PCI/AER: Move private AER things to aerdrv.c
PCI/AER: Move aer_irq() declaration to portdrv.h
PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h
PCI/AER: Remove duplicate pcie_port_bus_type declaration
PCI/AER: Squash ecrc.c into aerdrv.c
PCI/AER: Squash aerdrv_acpi.c into aerdrv.c
PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
PCI/AER: Squash aerdrv_core.c into aerdrv.c
PCI/AER: Reorder code to group probe/remove stuff together
PCI/AER: Remove forward declarations
PCI: Collect all native drivers under drivers/pci/controller/
Diffstat (limited to 'fs/xfs/xfs_inode.h')
0 files changed, 0 insertions, 0 deletions