linux-next: manual merge of the xen-tip tree with the pm tree

linux-next: manual merge of the xen-tip tree with the pm tree

[Stephen Rothwell]

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..000000000000
--- 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 **)&spcr_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;

Re: linux-next: manual merge of the xen-tip tree with the pm tree

[Rafael J. Wysocki]

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

[Stefano Stabellini]

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

linux-next: manual merge of the xen-tip tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  arch/x86/xen/enlighten_pv.c

between commit:

  f089ab674cea ("xen/x86: Use do_kernel_power_off()")

from the pm tree and commit:

  1591a65f55bc ("x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid")

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 arch/x86/xen/enlighten_pv.c
index af1f6e886225,ca85d1409917..000000000000
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@@ -30,8 -30,6 +30,7 @@@
  #include <linux/pci.h>
  #include <linux/gfp.h>
  #include <linux/edd.h>
- #include <linux/objtool.h>
 +#include <linux/reboot.h>
  
  #include <xen/xen.h>
  #include <xen/events.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]