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

From: Takashi Iwai <[email-masked]>
Date: Tue, 15 Jul 2008 08:23:26 +0200

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                    [email-masked]
> 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;