* linux-next: manual merge of the sound tree with the pxa tree
@ 2009-01-23 3:01 Stephen Rothwell
2009-01-23 3:08 ` Ian Molton
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2009-01-23 3:01 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, Eric Miao, Ian Molton, Mark Brown
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/e800_wm9712.c between commit
f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
#include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
Toshiba e800") from the sound tree.
Just overlapping context changes. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc sound/soc/pxa/e800_wm9712.c
index ac294c7,78a1770..0000000
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@@ -20,8 -18,12 +18,10 @@@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
- #include <asm/mach-types.h>
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
#include <mach/audio.h>
+ #include <mach/eseries-gpio.h>
+
+ #include <asm/mach-types.h>
#include "../codecs/wm9712.h"
#include "pxa2xx-pcm.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the sound tree with the pxa tree
2009-01-23 3:01 linux-next: manual merge of the sound tree with the pxa tree Stephen Rothwell
@ 2009-01-23 3:08 ` Ian Molton
2009-01-23 11:31 ` Mark Brown
0 siblings, 1 reply; 7+ messages in thread
From: Ian Molton @ 2009-01-23 3:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next, Eric Miao, Mark Brown
Stephen Rothwell wrote:
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/pxa/e800_wm9712.c between commit
> f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
> #include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
> Toshiba e800") from the sound tree.
>
> Just overlapping context changes. I fixed it up (see below) and can
> carry the fix as necessary.
Looks good. If it needs acking, then
Acked-by: Ian Molton <ian@mnementh.co.uk>
-Ian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the sound tree with the pxa tree
2009-01-23 3:08 ` Ian Molton
@ 2009-01-23 11:31 ` Mark Brown
0 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2009-01-23 11:31 UTC (permalink / raw)
To: Ian Molton; +Cc: Stephen Rothwell, Takashi Iwai, linux-next, Eric Miao
On Fri, Jan 23, 2009 at 03:08:06AM +0000, Ian Molton wrote:
> Stephen Rothwell wrote:
>> Just overlapping context changes. I fixed it up (see below) and can
>> carry the fix as necessary.
> Looks good. If it needs acking, then
> Acked-by: Ian Molton <ian@mnementh.co.uk>
Stephen's fix didn't apply directly to the ASoC tree so I've applied the
slightly different fix below which merges cleanly with the PXA commit
for me:
>From c91cf25ebfbf3a5b336cbaa46646d37dd3d33127 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 23 Jan 2009 11:23:32 +0000
Subject: [PATCH] ASoC: Fix merge with PXA tree
Fix a merge issue caused by context overlap.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/pxa/e800_wm9712.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 78a1770..bc019cd 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -18,13 +18,10 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
+#include <asm/mach-types.h>
#include <mach/audio.h>
#include <mach/eseries-gpio.h>
-#include <asm/mach-types.h>
-
#include "../codecs/wm9712.h"
#include "pxa2xx-pcm.h"
#include "pxa2xx-ac97.h"
--
1.5.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* linux-next: manual merge of the sound tree with the pxa tree
@ 2009-02-10 3:22 Stephen Rothwell
2009-02-10 3:35 ` Eric Miao
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2009-02-10 3:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, Philipp Zabel, Eric Miao
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/pxa2xx-i2s.c between commit
69e2a881351e31e936e3a75f8efff768f0edb2be ("[ARM] pxa: move DMA registers
definitions into <mach/dma.h>") from the pxa tree and commit
44dd2b9168350b82a671ce71666b99208ab2d973 ("ASoC: pxa2xx-i2s: remove I2S
pin setup") from the sound tree.
Just simple context change. I fiex it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc sound/soc/pxa/pxa2xx-i2s.c
index 223de89,83b59d7..0000000
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@@ -24,8 -24,7 +24,7 @@@
#include <sound/pxa2xx-lib.h>
#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
+#include <mach/dma.h>
- #include <mach/pxa2xx-gpio.h>
#include <mach/audio.h>
#include "pxa2xx-pcm.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: linux-next: manual merge of the sound tree with the pxa tree
2009-02-10 3:22 Stephen Rothwell
@ 2009-02-10 3:35 ` Eric Miao
2009-02-10 8:58 ` Takashi Iwai
0 siblings, 1 reply; 7+ messages in thread
From: Eric Miao @ 2009-02-10 3:35 UTC (permalink / raw)
To: Stephen Rothwell, Takashi Iwai; +Cc: linux-next@vger.kernel.org, Philipp Zabel
> Just simple context change. I fiex it up (see below) and can carry the
> fix as necessary.
Yes, this is correct. Thanks Stephen.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc sound/soc/pxa/pxa2xx-i2s.c
> index 223de89,83b59d7..0000000
> --- a/sound/soc/pxa/pxa2xx-i2s.c
> +++ b/sound/soc/pxa/pxa2xx-i2s.c
> @@@ -24,8 -24,7 +24,7 @@@
> #include <sound/pxa2xx-lib.h>
>
> #include <mach/hardware.h>
> -#include <mach/pxa-regs.h>
> +#include <mach/dma.h>
> - #include <mach/pxa2xx-gpio.h>
> #include <mach/audio.h>
>
> #include "pxa2xx-pcm.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the sound tree with the pxa tree
2009-02-10 3:35 ` Eric Miao
@ 2009-02-10 8:58 ` Takashi Iwai
2009-02-10 10:36 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Takashi Iwai @ 2009-02-10 8:58 UTC (permalink / raw)
To: Eric Miao; +Cc: Stephen Rothwell, linux-next@vger.kernel.org, Philipp Zabel
At Mon, 9 Feb 2009 19:35:07 -0800,
Eric Miao wrote:
>
> > Just simple context change. I fiex it up (see below) and can carry the
> > fix as necessary.
>
> Yes, this is correct. Thanks Stephen.
Confirmed to build fine with cross platform now.
Thanks.
Takashi
> >
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/
> >
> > diff --cc sound/soc/pxa/pxa2xx-i2s.c
> > index 223de89,83b59d7..0000000
> > --- a/sound/soc/pxa/pxa2xx-i2s.c
> > +++ b/sound/soc/pxa/pxa2xx-i2s.c
> > @@@ -24,8 -24,7 +24,7 @@@
> > #include <sound/pxa2xx-lib.h>
> >
> > #include <mach/hardware.h>
> > -#include <mach/pxa-regs.h>
> > +#include <mach/dma.h>
> > - #include <mach/pxa2xx-gpio.h>
> > #include <mach/audio.h>
> >
> > #include "pxa2xx-pcm.h"
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the sound tree with the pxa tree
2009-02-10 8:58 ` Takashi Iwai
@ 2009-02-10 10:36 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2009-02-10 10:36 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Eric Miao, linux-next@vger.kernel.org, Philipp Zabel
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Hi Takashi, Eric,
On Tue, 10 Feb 2009 09:58:02 +0100 Takashi Iwai <tiwai@suse.de> wrote:
>
> At Mon, 9 Feb 2009 19:35:07 -0800,
> Eric Miao wrote:
> >
> > > Just simple context change. I fiex it up (see below) and can carry the
> > > fix as necessary.
> >
> > Yes, this is correct. Thanks Stephen.
>
> Confirmed to build fine with cross platform now.
Thanks to both of you for confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-02-10 10:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-23 3:01 linux-next: manual merge of the sound tree with the pxa tree Stephen Rothwell
2009-01-23 3:08 ` Ian Molton
2009-01-23 11:31 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2009-02-10 3:22 Stephen Rothwell
2009-02-10 3:35 ` Eric Miao
2009-02-10 8:58 ` Takashi Iwai
2009-02-10 10:36 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).