Merge git://github.com/Jkirsher/net-next
This commit is contained in:
commit
fb7a6d4e7d
17 changed files with 446 additions and 248 deletions
|
|
@ -174,6 +174,8 @@ enum pci_dev_flags {
|
|||
PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
|
||||
/* Device configuration is irrevocably lost if disabled into D3 */
|
||||
PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
|
||||
/* Provide indication device is assigned by a Virtual Machine Manager */
|
||||
PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4,
|
||||
};
|
||||
|
||||
enum pci_irq_reroute_variant {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue