linux-next: manual merge of the spi tree with the pm tree

linux-next: manual merge of the spi tree with the pm tree

[Stephen Rothwell]

Hi Mark,

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

  drivers/spi/spi.c

between commit:

  8a2e487e6fc1 ("spi: Use Apple device properties in absence of ACPI resources")

from the pm tree and commit:

  9b61e302210e ("spi: Pick spi bus number from Linux idr or spi alias")

from the spi 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/spi/spi.c
index 7d920ea19957,43cb8b98e953..000000000000
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -40,7 -40,7 +40,8 @@@
  #include <linux/ioport.h>
  #include <linux/acpi.h>
  #include <linux/highmem.h>
 +#include <linux/platform_data/x86/apple.h>
+ #include <linux/idr.h>
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/spi.h>

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

[Stephen Rothwell]

Hi all,

On Thu, 17 Aug 2017 13:23:08 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the spi tree got a conflict in:
> 
>   drivers/spi/spi.c
> 
> between commit:
> 
>   8a2e487e6fc1 ("spi: Use Apple device properties in absence of ACPI resources")
> 
> from the pm tree and commit:
> 
>   9b61e302210e ("spi: Pick spi bus number from Linux idr or spi alias")
> 
> from the spi 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/spi/spi.c
> index 7d920ea19957,43cb8b98e953..000000000000
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@@ -40,7 -40,7 +40,8 @@@
>   #include <linux/ioport.h>
>   #include <linux/acpi.h>
>   #include <linux/highmem.h>
>  +#include <linux/platform_data/x86/apple.h>
> + #include <linux/idr.h>
>   
>   #define CREATE_TRACE_POINTS
>   #include <trace/events/spi.h>

Just a reminder that this conflict still exists.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the spi tree with the pm tree

[Stephen Rothwell]

Hi Mark,

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

  drivers/acpi/acpi_apd.c

between commit:

  6e14cf361a0c ("ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C controller")

from the pm tree and commit:

  251831bd4f49 ("spi: xlp: update for ARCH_VULCAN2")

from the spi 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/acpi_apd.c
index 8f57648f318b,17a1eb14847a..000000000000
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@@ -179,8 -169,7 +179,9 @@@ static const struct acpi_device_id acpi
  #ifdef CONFIG_ARM64
  	{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
  	{ "BRCM900D", APD_ADDR(vulcan_spi_desc) },
+ 	{ "CAV900D",  APD_ADDR(vulcan_spi_desc) },
 +	{ "HISI0A21", APD_ADDR(hip07_i2c_desc) },
 +	{ "HISI0A22", APD_ADDR(hip08_i2c_desc) },
  #endif
  	{ }
  };