On Tue, 12 Jul 2016, Rafael J. Wysocki wrote:
> On Tuesday, July 12, 2016 02:09:26 PM Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the xen-tip tree got a conflict in:
> >
> > drivers/acpi/scan.c
> >
> > between commit:
> >
> > 68bdb6773289 ("ACPI: add support for ACPI reconfiguration notifiers")
> >
> > from the pm tree and commit:
> >
> > c8ac8b6fb495 ("Xen: ACPI: Hide UART used by Xen")
> >
> > from the xen-tip tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Looks good to me, thanks Stehpen!
Looks good to me too.
Cheers,
Stefano
--
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
