linux-next: manual merge of the bpf-next tree with the pci-current tree

[Mark Brown]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  drivers/pci/pci.c

between commit:

  97958feb6560b ("PCI: Accept AtomicOps already enabled by the hypervisor")

from the pci-current tree and commit:

  40cce45b921f7 ("PCI: Accept AtomicOps already enabled by the hypervisor")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/pci/pci.c
index 62729ade496fc,8cc6a89130b53..0000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -3770,10 -3770,13 +3770,10 @@@ int pci_enable_atomic_ops_to_root(struc
  
  	root = pcie_find_root_port(dev);
  	if (!root) {
 -
  		/*
 -		 * A hypervisor may expose a topology with the root port
 -		 * not visible to the guest.  If the hypervisor has already
 -		 * set AtomicOp Requester Enable in the endpoint, we assume
 -		 * it has verified support in the root port, so it is safe
 -		 * for the driver to use AtomicOps.
 +		 * A hypervisor may expose a headless topology with no
 +		 * visible root port.  If it has already set AtomicOp
 +		 * Requester Enable, there is nothing more to do.
  		 */
  		pcie_capability_read_dword(dev, PCI_EXP_DEVCTL2, &ctl2);
  		if (ctl2 & PCI_EXP_DEVCTL2_ATOMIC_REQ)

Attachment: signature.asc
Description: PGP signature