Merge branch 'linus' into pci-for-jesse

diff --cc drivers/pci/probe.c
index 27cdbb06c4dd1a14ba0fec57e8f6d43a6d4caea8,b1724cf31b669ef459d3250aa8fae48b38e4c7fa..d2bd74ee3e0875c9f6211ed90ae7ab696b4a54a7
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -275,11 -275,10 +275,11 @@@ static void pci_read_bases(struct pci_d
                        }
                        res->start = l64 & PCI_BASE_ADDRESS_MEM_MASK;
                        res->end = res->start + sz64;
 +                      printk(KERN_INFO "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", pci_name(dev), reg, res->start, res->end);
  #else
                        if (sz64 > 0x100000000ULL) {
-                               printk(KERN_ERR "PCI: Unable to handle 64-bit "
-                                       "BAR for device %s\n", pci_name(dev));
+                               dev_err(&dev->dev, "BAR %d: can't handle 64-bit"
+                                       " BAR\n", pos);
                                res->start = 0;
                                res->flags = 0;
                        } else if (lhi) {

diff --cc drivers/pci/setup-bus.c
Simple merge