From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:42 +0000 (-0500)
Subject: Merge branch 'pci/enumeration'
X-Git-Tag: v6.1-rc5~2653^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1cac57a267c1692594413f27913adec85ba3b02a;p=platform%2Fkernel%2Flinux-starfive.git

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()
---

1cac57a267c1692594413f27913adec85ba3b02a