Re: linux-next: manual merge of the xen-tip tree with the pm tree
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
Re: linux-next: manual merge of the xen-tip tree with the pm tree
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
Re: linux-next: manual merge of the xen-tip tree with the pm tree
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
Re: linux-next: manual merge of the xen-tip tree with the pm tree
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
linux-next: manual merge of the xen-tip tree with the pm tree
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. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/acpi/scan.c index 405056b95b05,cfc73fecaba4.. --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@@ -1925,8 -1961,19 +1970,21 @@@ static int acpi_bus_scan_fixed(void return result < 0 ? result : 0; } + static void __init acpi_get_spcr_uart_addr(void) + { + acpi_status status; + struct acpi_table_spcr *spcr_ptr; + + status = acpi_get_table(ACPI_SIG_SPCR, 0, + (struct acpi_table_header **)_ptr); + if (ACPI_SUCCESS(status)) + spcr_uart_addr = spcr_ptr->serial_port.address; + else + printk(KERN_WARNING PREFIX "STAO table present, but SPCR is missing\n"); + } + +static bool acpi_scan_initialized; + int __init acpi_scan_init(void) { int result;
linux-next: manual merge of the xen-tip tree with the pm tree
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. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/acpi/scan.c index 405056b95b05,cfc73fecaba4.. --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@@ -1925,8 -1961,19 +1970,21 @@@ static int acpi_bus_scan_fixed(void return result < 0 ? result : 0; } + static void __init acpi_get_spcr_uart_addr(void) + { + acpi_status status; + struct acpi_table_spcr *spcr_ptr; + + status = acpi_get_table(ACPI_SIG_SPCR, 0, + (struct acpi_table_header **)_ptr); + if (ACPI_SUCCESS(status)) + spcr_uart_addr = spcr_ptr->serial_port.address; + else + printk(KERN_WARNING PREFIX "STAO table present, but SPCR is missing\n"); + } + +static bool acpi_scan_initialized; + int __init acpi_scan_init(void) { int result;