linux-next: manual merge of the sound-asoc tree with Linus' tree

linux-next: manual merge of the sound-asoc tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  4ac690bbae02 ("ASoC: ssm3515: Add new amp driver")

from the sound-asoc 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 MAINTAINERS
index a8f74c3e72c9,c919c282f599..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1929,15 -1934,6 +1929,17 @@@ F:	arch/arm/mach-alpine
  F:	arch/arm64/boot/dts/amazon/
  F:	drivers/*/*alpine*
  
 +ARM/APPLE MACHINE SOUND DRIVERS
 +M:	Martin Povišer <povik+lin@cutebit.org>
 +L:	asahi@lists.linux.dev
 +L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:	Maintained
++F:	Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
 +F:	Documentation/devicetree/bindings/sound/apple,*
 +F:	sound/soc/apple/*
 +F:	sound/soc/codecs/cs42l83-i2c.c
++F:	sound/soc/codecs/ssm3515.c
 +
  ARM/APPLE MACHINE SUPPORT
  M:	Hector Martin <marcan@marcan.st>
  M:	Sven Peter <sven@svenpeter.dev>

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

linux-next: manual merge of the sound-asoc tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
arch/powerpc/platforms/85xx/p1022_ds.c between commit
dc1c41f450a5f201f1d8c19aef32319f3b84c273 ("powerpc/85xx: Fix compile
issue with p1022_ds due to lmb rename to memblock") from Linus' tree and
commit 2c184cd393d1410bb43ac656a6480849fe886b1d ("powerpc/85xx: add DIU
support to the Freecale P1022DS reference board") from the sound-asoc
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
index 2b390d1,e984d4e..0000000
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@@ -19,8 -18,9 +18,9 @@@
  
  #include <linux/pci.h>
  #include <linux/of_platform.h>
 -#include <linux/lmb.h>
  #include <linux/memblock.h>
 +
+ #include <asm/div64.h>
  #include <asm/mpic.h>
  #include <asm/swiotlb.h>
  

Re: linux-next: manual merge of the sound-asoc tree with Linus' tree

[Mark Brown]

On Fri, Oct 15, 2010 at 11:52:51AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/powerpc/platforms/85xx/p1022_ds.c between commit
> dc1c41f450a5f201f1d8c19aef32319f3b84c273 ("powerpc/85xx: Fix compile
> issue with p1022_ds due to lmb rename to memblock") from Linus' tree and
> commit 2c184cd393d1410bb43ac656a6480849fe886b1d ("powerpc/85xx: add DIU
> support to the Freecale P1022DS reference board") from the sound-asoc
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

I had to apply the reverse of that to to apply on ASoC so this looks to
be the best fix :)