]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 141ad87 7a1c5f7)
Merge branch 'pci/enumeration'
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 5 Nov 2021 16:28:42 +0000 (11:28 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 5 Nov 2021 16:28:42 +0000 (11:28 -0500)
commitb2c85bd91d521e8199e979751cc6d3603e62c932
treea53ec47abecf4b33d9dbe7c744f21de5b4fc7382tree | snapshot
parent141ad87487295bb82e1cb048fd8967f78fc04284commit | diff
parent7a1c5f7807b10b073ce814a93af7951f4324b087commit | diff
Merge branch 'pci/enumeration'

- Rename pcibios_add_device() to pcibios_device_add() since it's called
  from pci_device_add() (Oliver O'Halloran)

- Don't try to enable AtomicOps on VFs, since they can only be enabled on
  the PF (Selvin Xavier)

* pci/enumeration:
  PCI: Do not enable AtomicOps on VFs
  PCI: Rename pcibios_add_device() to pcibios_device_add()
drivers/pci/pci.c diff1 | diff2 | blob | history
drivers/pci/probe.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.