linux-next: manual merge of the sound tree

linux-next: manual merge of the sound tree

[Stephen Rothwell]

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

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
sound/drivers/pcsp/pcsp.c between commit
ca109491f612aab5c8152207631c0444f63da97f ("hrtimer: removing all ur
callback modes") from the timers tree and commit
8a75f4fb28766878893b4335f4b5743ce9b931fe ("ALSA: pcsp - Use
HRTIMER_CB_IRQSAFE_UNLOCKED") from the sound tree.

The former removed the line that the latter modified.  I just removed the
line and can carry this fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the sound tree

[David Miller]

From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 01 Sep 2008 10:34:32 +0200

> But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
> window is opened.

I think it will be easy to resolve, either way.

Re: linux-next: manual merge of the sound tree

[Takashi Iwai]

At Mon, 1 Sep 2008 19:03:07 +1000,
Stephen Rothwell wrote:
> 
> On Mon, 01 Sep 2008 10:34:32 +0200 Takashi Iwai <tiwai@suse.de> wrote:
> >
> > > The other option is for Stephen to just keep fixing the merge,
> > > if we just do nothing his way of doing this is automated.
> > 
> > That's fine for me, too.
> > But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
> > window is opened.
> 
> Thats fine by me.  Looks like whoever gets in first in the merge window
> wins :-)

Well, basically I just need to leave the code David changes as is so
that the patch doesn't conflict.  Then git will resolve the rest
gracefully.

I fixed the conflict and rebuilt my tree now.  Tomorrow's linux-next
merge should work without conflict.  Let me know if you still get a
conflict.


thanks,

Takashi

Re: linux-next: manual merge of the sound tree

[Stephen Rothwell]

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

On Mon, 01 Sep 2008 10:34:32 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> > The other option is for Stephen to just keep fixing the merge,
> > if we just do nothing his way of doing this is automated.
> 
> That's fine for me, too.
> But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
> window is opened.

Thats fine by me.  Looks like whoever gets in first in the merge window
wins :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the sound tree

[Takashi Iwai]

At Mon, 01 Sep 2008 01:28:27 -0700 (PDT),
David Miller wrote:
> 
> > Where can I find this change?  I now looked at
> >   git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
> > but it has no such a commit
> 
> sparc-next-2.6.git is where "-next" changes for Sparc live :)

Ah, that obvious one.  Thanks.

> > I can either remove the affecting chunk in my patch, or merge your
> > patch first to my tree and rebase.
> 
> The other option is for Stephen to just keep fixing the merge,
> if we just do nothing his way of doing this is automated.

That's fine for me, too.
But, I guess we'd need to fix the conflict anyway when 2.6.28 merge
window is opened.


Takashi

Re: linux-next: manual merge of the sound tree

[David Miller]

From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 01 Sep 2008 07:53:31 +0200

> Where can I find this change?  I now looked at
>   git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
> but it has no such a commit

sparc-next-2.6.git is where "-next" changes for Sparc live :)

> I can either remove the affecting chunk in my patch, or merge your
> patch first to my tree and rebase.

The other option is for Stephen to just keep fixing the merge,
if we just do nothing his way of doing this is automated.

Re: linux-next: manual merge of the sound tree

[Takashi Iwai]

At Sun, 31 Aug 2008 21:36:07 -0700 (PDT),
David Miller wrote:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 1 Sep 2008 14:20:30 +1000
> 
> > Today's linux-next merge of the sound tree got a conflict in
> > sound/core/memalloc.c between commit
> > 759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS
> > dma support code.") from the sparc tree and commit
> > d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert()
> > in sound/core/*") from the sound tree.
> > 
> > The former removes code modified by the latter.  I just removed the
> > code.  I will carry the fixup.
> 
> Thanks Stephen.
> 
> Takashi-san, FYI, in the Sparc tree we have removed all SBUS specific
> BUS probing and device code, all drivers are now generic and use plain
> linux/dma-mapping.h interfaces.
> 
> So the sound layer SBUS code was superfluous and unused, so we
> deleted it.

Thanks David, that's a good clean up (but a bad timing for me ;-)

Where can I find this change?  I now looked at
  git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
but it has no such a commit

I can either remove the affecting chunk in my patch, or merge your
patch first to my tree and rebase.


Takashi

Re: linux-next: manual merge of the sound tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Sep 2008 14:20:30 +1000

> Today's linux-next merge of the sound tree got a conflict in
> sound/core/memalloc.c between commit
> 759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS
> dma support code.") from the sparc tree and commit
> d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert()
> in sound/core/*") from the sound tree.
> 
> The former removes code modified by the latter.  I just removed the
> code.  I will carry the fixup.

Thanks Stephen.

Takashi-san, FYI, in the Sparc tree we have removed all SBUS specific
BUS probing and device code, all drivers are now generic and use plain
linux/dma-mapping.h interfaces.

So the sound layer SBUS code was superfluous and unused, so we
deleted it.

linux-next: manual merge of the sound tree

[Stephen Rothwell]

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

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in sound/core/memalloc.c between commit 759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS dma support code.") from the sparc tree and commit d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert() in sound/core/*") from the sound tree.

The former removes code modified by the latter.  I just removed the
code.  I will carry the fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the sound tree

[Stephen Rothwell]

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

Hi Takashi,

On Tue, 15 Jul 2008 08:23:26 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> I already rebased my tree to the latest Linus tree, and there was no
> conflict indeed.  So, simply drop sound tree from linux-next for today
> :)  The merge on tomorrow should be fine.

Too late, its already merged!  :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the sound tree

[Takashi Iwai]

At Tue, 15 Jul 2008 15:47:21 +1000,
Stephen Rothwell wrote:
> 
> Hi Takashi,
> 
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/pxa/pxa2xx-i2s.c between commit
> 5a2cc50f166babc26103279c4fbc9f2bf73b79de ("[ARM] 5063/1: pxa: add clk
> support for pxa2xx I2S") from Linus' tree and commit
> a0386ed67f59f89f14dca2955ca053e81f2b75a8 ("ALSA: asoc: pxa - merge
> structs snd_soc_codec_dai and snd_soc_cpu_dai") from the sound tree
> (which is also in Linus' tree).
> 
> This is probably just a slightly different version of a conflict that has
> been in linux-next for some time.
> 
> I just added the section from Linus' tree.
> (The conflict is below)

I already rebased my tree to the latest Linus tree, and there was no
conflict indeed.  So, simply drop sound tree from linux-next for today
:)  The merge on tomorrow should be fine.


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 8f96d87,9c06553..0000000
> --- a/sound/soc/pxa/pxa2xx-i2s.c
> +++ b/sound/soc/pxa/pxa2xx-i2s.c
> @@@ -80,10 -78,6 +80,13 @@@ static int pxa2xx_i2s_startup(struct sn
>   {
>         struct snd_soc_pcm_runtime *rtd = substream->private_data;
>         struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
> ++<<<<<<< HEAD:sound/soc/pxa/pxa2xx-i2s.c
>  +
>  +      clk_i2s = clk_get(NULL, "I2SCLK");
>  +      if (IS_ERR(clk_i2s))
>  +              return PTR_ERR(clk_i2s);
> ++=======
> ++>>>>>>> sound/master:sound/soc/pxa/pxa2xx-i2s.c
>   
>         if (!cpu_dai->active) {
>                 SACR0 |= SACR0_RST;

linux-next: manual merge of the sound tree

[Stephen Rothwell]

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

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/pxa2xx-i2s.c between commit
5a2cc50f166babc26103279c4fbc9f2bf73b79de ("[ARM] 5063/1: pxa: add clk
support for pxa2xx I2S") from Linus' tree and commit
a0386ed67f59f89f14dca2955ca053e81f2b75a8 ("ALSA: asoc: pxa - merge
structs snd_soc_codec_dai and snd_soc_cpu_dai") from the sound tree
(which is also in Linus' tree).

This is probably just a slightly different version of a conflict that has
been in linux-next for some time.

I just added the section from Linus' tree.
(The conflict is below)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc sound/soc/pxa/pxa2xx-i2s.c
index 8f96d87,9c06553..0000000
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@@ -80,10 -78,6 +80,13 @@@ static int pxa2xx_i2s_startup(struct sn
  {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
++<<<<<<< HEAD:sound/soc/pxa/pxa2xx-i2s.c
 +
 +      clk_i2s = clk_get(NULL, "I2SCLK");
 +      if (IS_ERR(clk_i2s))
 +              return PTR_ERR(clk_i2s);
++=======
++>>>>>>> sound/master:sound/soc/pxa/pxa2xx-i2s.c
  
        if (!cpu_dai->active) {
                SACR0 |= SACR0_RST;

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]