diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:55:02 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 08:55:02 -0500 |
commit | 18e5e6913b1ae5c6f60390945d4c8446f5c40c89 (patch) | |
tree | 223ed27715cc5609350905aeda961066005be645 /drivers/ide/serverworks.c | |
parent | a314966fad613dbe644066d34eee9edc8afd6258 (diff) | |
parent | 8e47e15e917fca36945c2f03de28cfda0c8499f0 (diff) | |
parent | 6ca7227b3e24e4ba445464779a66558a8b9e0617 (diff) | |
parent | cc73176cc91b67f4f07385d0dcfde954e54f42c3 (diff) | |
parent | 7b78f48a0443eceae435870b14e86d586f8c2a3e (diff) | |
parent | 5adecf817dd630529d6565a242141db2df3239f7 (diff) | |
parent | 7c20078a8197389eead62399419fdc4f8ac4a8a3 (diff) | |
download | linux-18e5e6913b1ae5c6f60390945d4c8446f5c40c89.tar.gz |
Merge branches 'pci/aer', 'pci/enumeration', 'pci/kconfig', 'pci/misc', 'pci/virtualization' and 'pci/vpd' into next
* pci/aer:
PCI/AER: Log aer_inject error injections
PCI/AER: Log actual error causes in aer_inject
PCI/AER: Use dev_warn() in aer_inject
PCI/AER: Fix aer_inject error codes
* pci/enumeration:
PCI: Fix broken URL for Dell biosdevname
* pci/kconfig:
PCI: Cleanup pci/pcie/Kconfig whitespace
PCI: Include pci/hotplug Kconfig directly from pci/Kconfig
PCI: Include pci/pcie/Kconfig directly from pci/Kconfig
* pci/misc:
PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
PCI: Add QEMU top-level IDs for (sub)vendor & device
unicore32: Remove unused HAVE_ARCH_PCI_SET_DMA_MASK definition
PCI: Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h
PCI: Move pci_dma_* helpers to common code
frv/PCI: Remove stray pci_{alloc,free}_consistent() declaration
* pci/virtualization:
PCI: Wait for up to 1000ms after FLR reset
PCI: Support SR-IOV on any function type
* pci/vpd:
PCI: Prevent VPD access for buggy devices
PCI: Sleep rather than busy-wait for VPD access completion
PCI: Fold struct pci_vpd_pci22 into struct pci_vpd
PCI: Rename VPD symbols to remove unnecessary "pci22"
PCI: Remove struct pci_vpd_ops.release function pointer
PCI: Move pci_vpd_release() from header file to pci/access.c
PCI: Move pci_read_vpd() and pci_write_vpd() close to other VPD code
PCI: Determine actual VPD size on first access
PCI: Use bitfield instead of bool for struct pci_vpd_pci22.busy
PCI: Allow access to VPD attributes with size 0
PCI: Update VPD definitions