Re: linux-next: manual merge of the pci tree with Linus' tree

[Bjorn Helgaas]

On Mon, Jun 3, 2013 at 7:49 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/acpi/pci_root.c between commit 3f327e39b4b8 ("PCI: acpiphp:
> Re-enumerate devices when host bridge receives Bus Check") from Linus'
> tree and commit 6dc7d22c6738 ("PCI/ACPI: Use dev_printk(),
> acpi_handle_print(), pr_xxx() when possible") from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks perfect, thanks!

> --
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/acpi/pci_root.c
> index e427dc5,122b4dc..0000000
> --- a/drivers/acpi/pci_root.c
> +++ b/drivers/acpi/pci_root.c
> @@@ -639,11 -620,9 +620,11 @@@ static void _handle_hotplug_event_root(
>         switch (type) {
>         case ACPI_NOTIFY_BUS_CHECK:
>                 /* bus enumerate */
> -               printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
> -                                (char *)buffer.pointer);
> +               acpi_handle_printk(KERN_DEBUG, handle,
> +                                  "Bus check notify on %s\n", __func__);
>  -              if (!root)
>  +              if (root)
>  +                      acpiphp_check_host_bridge(handle);
>  +              else
>                         handle_root_bridge_insertion(handle);
>
>                 break;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/