* linux-next: manual merge of the sound tree with the Linus' tree
@ 2010-12-06 0:35 Stephen Rothwell
2010-12-06 1:30 ` Kuninori Morimoto
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-12-06 0:35 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Kuninori Morimoto, Paul Mundt
Hi Takashi,
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.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
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 {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the sound tree with the Linus' tree
2010-12-06 0:35 linux-next: manual merge of the sound tree with the Linus' tree Stephen Rothwell
@ 2010-12-06 1:30 ` Kuninori Morimoto
2010-12-06 8:02 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Kuninori Morimoto @ 2010-12-06 1:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next, linux-kernel, Paul Mundt
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.
Above fixup is excellent
Best regards
--
Kuninori Morimoto
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the sound tree with the Linus' tree
2010-12-06 1:30 ` Kuninori Morimoto
@ 2010-12-06 8:02 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2010-12-06 8:02 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Stephen Rothwell, linux-next, linux-kernel, Paul Mundt
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-06 8:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-06 0:35 linux-next: manual merge of the sound tree with the Linus' tree Stephen Rothwell
2010-12-06 1:30 ` Kuninori Morimoto
2010-12-06 8:02 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox