At Mon, 06 Dec 2010 10:30:44 +0900,
Kuninori Morimoto wrote:
>
>
> Dear Stephen, Takashi, Paul
>
> > Today's linux-next merge of the sound tree got a conflict in
> > sound/soc/sh/fsi.c between commit
> > d4bc99b977e3a1dd10a84a01ebe59ac2ccebf0cd ("ARM: mach-shmobile: ap4evb:
> > FSI clock use proper process for HDMI") from Linus' tree and commit
> > 2b0e73025f74699e9cc9df60649fcc14cd02481b ("ASoC: sh: fsi: change
> > fsi->mst_ctrl to master->a/b_mclk") from the sound tree.
> (snip)
> > diff --cc sound/soc/sh/fsi.c
> > index 4c2404b,19a2f99..0000000
> > --- a/sound/soc/sh/fsi.c
> > +++ b/sound/soc/sh/fsi.c
> > @@@ -131,10 -142,6 +142,8 @@@ struct fsi_priv
> >
> > struct fsi_stream playback;
> > struct fsi_stream capture;
> > +
> > + long rate;
> > -
> > - u32 mst_ctrl;
> > };
> >
> > struct fsi_core {
>
> Oops. I'm so sorry.
> I didn't care about this conflict. sorry again.
Don't worry, such a conflict isn't your fault, but happens rather
occasionally in everywhere :)
> Above fixup is excellent
Thanks for checking!
Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
