Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/numa' and 'pci...

* pci/enumeration:
  PCI: Remove fixed parameter in pci_iov_resource_bar()
  PCI: Add informational printk for invalid BARs
  PCI: Shrink decoding-disabled window while sizing BARs
  PCI: Restore detection of read-only BARs

* pci/hotplug:
  PCI: Remove unused and broken to_hotplug_slot()

* pci/misc:
  PCI: Make FLR and AF FLR reset warning messages different
  PCI: Simplify if-return sequences
  PCI: Delete unnecessary NULL pointer checks

* pci/numa:
  PCI: Allow numa_node override via sysfs

* pci/virtualization:
  xen/pcifront: Process failure for pcifront_(re)scan_root()

diff --cc drivers/pci/pci.c
index 625a4ace10b4411aed1cbda278a3851d9299965d,7bf246595c63d08615cec04466784d81f134af5b,625a4ace10b4411aed1cbda278a3851d9299965d,e8b3627e5474a70d4d28c4aaa2b78e8fe954d41a,625a4ace10b4411aed1cbda278a3851d9299965d,625a4ace10b4411aed1cbda278a3851d9299965d..a7ac72639c522c41752c47349f69326cb3c4447b
--- 1/drivers/pci/pci.c
--- 2/drivers/pci/pci.c
--- 3/drivers/pci/pci.c
--- 4/drivers/pci/pci.c
--- 5/drivers/pci/pci.c
--- 6/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@@@@@ -3174,16 -3174,16 -3174,16 -3168,12 -3174,16 -3174,16 +3168,12 @@@@@@@ static int pci_af_flr(struct pci_dev *d
         * is used, so we use the conrol offset rather than status and shift
         * the test bit to match.
         */
--- --  if (pci_wait_for_pending(dev, pos + PCI_AF_CTRL,
+++ ++  if (!pci_wait_for_pending(dev, pos + PCI_AF_CTRL,
                                 PCI_AF_STATUS_TP << 8))
--- --          goto clear;
- - --
- - --  dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n");
+++ ++          dev_err(&dev->dev, "timed out waiting for pending transaction; performing AF function level reset anyway\n");
      
 -      dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n");
 -    
--- --clear:
        pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR);
        msleep(100);
--- --
        return 0;
      }
      

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge