Hi all,
Today's linux-next merge of the timers tree got a conflict in
drivers/pci/probe.c between commit
4ca8a7726fb0e8094fdb56f2ae2d69fcf9254eae ("PCI: Fix printk warnings in
probe.c") from the pci-current tree and commit
ca81beb4a340ee690803fcb1498f863d0e68843f ("pci: fix BAR print out") from
the timers tree.
Overlapping changes. I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/pci/probe.c
index 8e30dee,477fe9b..0000000
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -383,9 -389,8 +389,9 @@@ void __devinit pci_read_bridge_bases(st
res->start = base;
if (!res->end)
res->end = limit + 0xfff;
- printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n",
+ printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
- pci_name(dev), res->start, res->end);
+ pci_name(dev), (unsigned long long) res->start,
+ (unsigned long long) res->end);
}
res = child->resource[1];
@@@ -397,8 -402,8 +403,8 @@@
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
res->start = base;
res->end = limit + 0xfffff;
- printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev),
- printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
- pci_name(dev), res->start, res->end);
++ printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev),
+ (unsigned long long) res->start, (unsigned long long) res->end);
}
res = child->resource[2];
@@@ -434,9 -439,9 +440,9 @@@
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
res->start = base;
res->end = limit + 0xfffff;
- printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
+ printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
- pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",
- res->start, res->end);
+ pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
+ (unsigned long long) res->start, (unsigned long long) res->end);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
