The patch titled pci: follow lspci device/vendor style has been added to the -mm tree. Its filename is pci-follow-lspci-device-vendor-style.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pci: follow lspci device/vendor style From: Bjorn Helgaas <bjorn.helgaas@xxxxxx> Use "[%04x:%04x]" for PCI vendor/device IDs to follow the format used by lspci(8). Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/pci/pcie/portdrv_pci.c~pci-follow-lspci-device-vendor-style drivers/pci/pcie/portdrv_pci.c --- a/drivers/pci/pcie/portdrv_pci.c~pci-follow-lspci-device-vendor-style +++ a/drivers/pci/pcie/portdrv_pci.c @@ -91,7 +91,7 @@ static int __devinit pcie_portdrv_probe pci_set_master(dev); if (!dev->irq && dev->pin) { - dev_warn(&dev->dev, "device [%04x/%04x] has invalid IRQ; " + dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; " "check vendor BIOS\n", dev->vendor, dev->device); } if (pcie_port_device_register(dev)) { diff -puN drivers/pci/probe.c~pci-follow-lspci-device-vendor-style drivers/pci/probe.c --- a/drivers/pci/probe.c~pci-follow-lspci-device-vendor-style +++ a/drivers/pci/probe.c @@ -757,7 +757,7 @@ static int pci_setup_device(struct pci_d dev->class = class; class >>= 8; - dev_dbg(&dev->dev, "found [%04x/%04x] class %06x header type %02x\n", + dev_dbg(&dev->dev, "found [%04x:%04x] class %06x header type %02x\n", dev->vendor, dev->device, class, dev->hdr_type); /* "Unknown power state" */ _ Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are linux-next.patch mm-only-enforce-acpi-resource-conflict-checks.patch x86-use-dev_printk-in-quirk-message.patch pci-tidy-pme-support-messages.patch pci-tidy-pme-support-messages-checkpatch-fixes.patch vsprintf-use-new-vsprintf-symbolic-function-pointer-format.patch vsprintf-use-new-vsprintf-symbolic-function-pointer-format-cleanup.patch pnp-remove-printk-with-outdated-version.patch pnp-make-the-resource-type-an-unsigned-long.patch pnp-make-the-resource-type-an-unsigned-long-fix.patch firmware-use-dev_printk-when-possible.patch resources-tidy-__request_region.patch x86-pci-follow-lspci-device-vendor-style.patch agp-follow-lspci-device-vendor-style.patch v4l-dvb-follow-lspci-device-vendor-style.patch irda-follow-lspci-device-vendor-style.patch pci-follow-lspci-device-vendor-style.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html