diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-12 22:26:45 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-12 22:26:45 +0200 |
| commit | 0ff9b9bad66730e8347cb3350c8d3d1b88a21f13 (patch) | |
| tree | 0226398d73d5202752e892a683dd86fcbda8b6c8 /include | |
| parent | Linux 4.1-rc2 (diff) | |
| parent | PCI/ASPM: Simplify Clock Power Management setting (diff) | |
| parent | PCI: Remove unused pci_scan_bus_parented() (diff) | |
| parent | PCI: pciehp: Wait for hotplug command completion where necessary (diff) | |
| parent | PCI: Remove unused pci_dma_burst_advice() (diff) | |
| parent | PCI/MSI: Remove unused pci_msi_off() (diff) | |
| parent | PCI: Add pci_bus_addr_t (diff) | |
| parent | ACPI / PCI: Account for ARI in _PRT lookups (diff) | |
| download | linux-0ff9b9bad66730e8347cb3350c8d3d1b88a21f13.tar.xz linux-0ff9b9bad66730e8347cb3350c8d3d1b88a21f13.zip | |
Merge branches 'pci/aspm', 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/resource' and 'pci/virtualization' into next
* pci/aspm:
PCI/ASPM: Simplify Clock Power Management setting
PCI: Use dev->has_secondary_link to find downstream PCIe links
PCI/ASPM: Use dev->has_secondary_link to find downstream links
PCI: Add dev->has_secondary_link to track downstream PCIe links
PCI/ASPM: Remove redundant PCIe port type checking
PCI/ASPM: Drop __pci_disable_link_state() useless "force" parameter
* pci/enumeration:
PCI: Remove unused pci_scan_bus_parented()
xen/pcifront: Don't use deprecated function pci_scan_bus_parented()
PCI: designware: Use pci_scan_root_bus() for simplicity
PCI: tegra: Remove tegra_pcie_scan_bus()
PCI: mvebu: Remove mvebu_pcie_scan_bus()
* pci/hotplug:
PCI: pciehp: Wait for hotplug command completion where necessary
PCI: Propagate the "ignore hotplug" setting to parent
ACPI / hotplug / PCI: Check ignore_hotplug for all downstream devices
PCI: pciehp: Drop pointless label from pciehp_probe()
PCI: pciehp: Drop pointless ACPI-based "slot detection" check
* pci/misc:
PCI: Remove unused pci_dma_burst_advice()
PCI: Remove unused pcibios_select_root() (again)
PCI: Remove unnecessary #includes of <asm/pci.h>
PCI: Include <linux/pci.h>, not <asm/pci.h>
* pci/msi:
PCI/MSI: Remove unused pci_msi_off()
PCI/MSI: Drop pci_msi_off() calls from quirks
ntb: Drop pci_msi_off() call during probe
virtio_pci: drop pci_msi_off() call during probe
PCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI
PCI/MSI: Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl()
PCI/MSI: Rename msi_set_enable(), msix_clear_and_set_ctrl()
* pci/resource:
PCI: Add pci_bus_addr_t
* pci/virtualization:
ACPI / PCI: Account for ARI in _PRT lookups
PCI: Move pci_ari_enabled() to global header
PCI: Add function 1 DMA alias quirk for Marvell 9120
PCI: Add ACS quirks for Intel 9-series PCH root ports