Merge branches 'pci/aer' and 'pci/virtualization' into next

Browse source

* pci/aer:
  PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND
  PCI/AER: Add additional PCIe AER error strings
  trace, RAS: Add additional PCIe AER error strings
  trace, RAS: Replace bare numbers with #defines for PCIe AER error strings

* pci/virtualization:
  PCI: Add ACS quirk for Intel 10G NICs

...

This commit is contained in:

Bjorn Helgaas 2014-10-01 12:30:58 -06:00

parent 1104528bc7 846fc70986 100ebb2c48

commit cc0cb67adb

5 changed files with 68 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

46

include/ras/ras_event.h

View file

2

include/uapi/linux/pci_regs.h

View file