Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the xen-tip tree with the pm tree | Date | Tue, 12 Jul 2016 14:14:21 +0200 |
| |
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!
Best, Rafael
| |