From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Takashi Iwai' <tiwai@suse•de>
Cc: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Jassi Brar' <jassi.brar@samsung•com>
Subject: RE: linux-next: manual merge of the sound tree with the s5p tree
Date: Thu, 23 Dec 2010 20:11:56 +0900 [thread overview]
Message-ID: <004001cba292$3827d2d0$a8777870$%kim@samsung.com> (raw)
In-Reply-To: <s5hk4j0n43g.wl%tiwai@suse.de>
Takashi Iwai wrote:
>
> At Thu, 23 Dec 2010 19:31:12 +0900,
> Kukjin Kim wrote:
> >
> > Stephen Rothwell wrote:
> > >
> > > Hi Takashi,
> > >
> > > Today's linux-next merge of the sound tree got a conflict in
> > > sound/soc/samsung/smdk_wm8580.c sound/soc/samsung/smdk_wm9713.c
between
> > > commit 7ca825bed699c77b218ead402202df384556950b ("ASoC: Samsung:
Rename
> > > DMA device") from the s5p tree and various commits from the sound
tree.
> > >
> > > I used the versions from the sound tree that seemed to be supersets of
> the
> > > ones from the s5p tree.
> >
> > Merry Xmas Stephen :-)
> >
> > Thanks for your information.
> >
> > As I said to Mark, I did 'cherry-pick' following 2 commits in my tree
for
> > avoiding build error from sound-2.6.git.
> > I couldn't 'merge' into my tree because there is no suitable branch in
your
> > tree...
> >
> > --
> >
> > commit 83e37b8e400ca51cc97946815b3055daacd92fa8
> > Author: Jassi Brar <jassi.brar@samsung•com>
> > Date: Mon Nov 22 15:35:53 2010 +0900
> >
> > ARM: Samsung: Define common audio-dma device
> >
> > The ASoC uses common DMA driver for Audio devices. So it makes
> > sense to a common audio-dma device shared across all platforms.
> >
> > Signed-off-by: Jassi Brar <jassi.brar@samsung•com>
> > Acked-by: Kukjin Kim <kgene.kim@samsung•com>
> > Acked-by: Liam Girdwood <lrg@slimlogic•co.uk>
> > Signed-off-by: Mark Brown <broonie@opensource•wolfsonmicro.com>
> >
> > commit 58bb4072132c54d832082cc6eac396a6db009cbd
> > Author: Jassi Brar <jassi.brar@samsung•com>
> > Date: Mon Nov 22 15:35:50 2010 +0900
> >
> > ASoC: Samsung: Rename DMA device
> >
> > Some Samsung SoCs have a PCM(DSP) controller. So the name
> > s3c24xx-pcm-audio for DMA driver is not very appropraite.
> > This patch moves :-
> > s3c24xx-pcm-audio -> samsung-audio
> >
> > Signed-off-by: Jassi Brar <jassi.brar@samsung•com>
> > Acked-by: Kukjin Kim <kgene.kim@samsung•com>
> > Acked-by: Liam Girdwood <lrg@slimlogic•co.uk>
> > Signed-off-by: Mark Brown <broonie@opensource•wolfsonmicro.com>
> >
> > --
> >
> > Maybe happened conflict from latter commit.
> >
> > Anyway I need above commits from sound-2.6.git in my tree...
> > so how method is better to me instead of cherry-pick it?
>
> You can merge topic/asoc branch of sound git tree.
> This brach contains the all necessary commits for ASoC and is almost
> never rebased.
Hi,
But I can't merge it because there is no 'topic/asoc' branch in
sound-2.6.git.
(git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git)
Is there another repository?
And should I merge it in my tree even though don't need all of ASoC commits
:-( ?
I'm not sure how many commits are in there...
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2010-12-23 11:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-23 0:53 linux-next: manual merge of the sound tree with the s5p tree Stephen Rothwell
2010-12-23 10:31 ` Kukjin Kim
2010-12-23 11:03 ` Takashi Iwai
2010-12-23 11:11 ` Kukjin Kim [this message]
2010-12-23 11:17 ` Takashi Iwai
2010-12-23 11:28 ` Kukjin Kim
2010-12-23 14:30 ` Takashi Iwai
2010-12-24 1:32 ` Kukjin Kim
2010-12-24 8:27 ` Russell King
2010-12-28 2:24 ` Kukjin Kim
2010-12-28 15:39 ` Mark Brown
2010-12-28 16:23 ` Russell King
2010-12-28 16:40 ` Mark Brown
2010-12-30 0:54 ` Kukjin Kim
2010-12-23 11:50 ` Mark Brown
2010-12-23 11:54 ` Piotr Hosowicz
2010-12-23 11:56 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='004001cba292$3827d2d0$a8777870$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=jassi.brar@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox