Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Jassi Brar' <jassisinghbrar@gmail.com>
Cc: alsa-devel@alsa-project.org,
	'Jassi Brar' <jassi.brar@samsung.com>,
	broonie@opensource.wolfsonmicro.com, mcuelenaere@gmail.com,
	cw00.choi@samsung.com, ben-linux@fluff.org, june.bae@samsung.com,
	sw.youn@samsung.com, lrg@slimlogic.co.uk
Subject: Re: [PATCHv2] ASoC: Overhaul Samsung drivers
Date: Mon, 25 Oct 2010 11:31:16 +0900	[thread overview]
Message-ID: <017701cb73ec$b531b180$1f951480$%kim@samsung.com> (raw)
In-Reply-To: <AANLkTinkfDERN6GX7mF-Q6XyC1zxL5SPAX1id-u4zbMy@mail.gmail.com>

Jassi Brar wrote:
> 
> On Fri, Oct 22, 2010 at 11:08 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> >> Patches 11 through 16 apply to Kgene's tree, rest apply to
> >> Mark Brown's.
> >>
> > Hmm...
> >
> > I faced with following build error after applying above 6 patches into my
> > tree.
> > It means can't make clean tree with only arch/arm patches?...
> > NO...just need to update arch/arm/plat-samsung/include/plat/audio.h of your
> > 10/24 patch.
> > Please separate 10/24...there is no reason that to change plat/audio.h
> > belong to 10/24(Add common I2S driver)
> 
> I had initially planned to send codes via relevant trees. So, the
> plat/audio.h
> update(along with arch/ audio ) was legit to be part of I2S ASoC drivers
> update.
> The change could be atomic if sent via ASoC tree.
> 
> I can segregate the changes, if you are going prepare a branch for
> Mark to exchange
> inter-dependent patches. Will do.
> 
Thanks.
I will make 'for-broonie' which includes ARCH_S5P64X0 and GPIO updates for your patches.

> The incorrect symbol name and missing semicolon is totally my mistake.
> I sent the
> last but one version of patches by mistake. Will update soon.
> 
No prob. ;-)

> Mark,
> I am hesitant to resend 24 patches to ALSA ML with only 1 patch
> divided into two,
> but perhaps I have no other option ?
> 
Mark,

As I said, will make 'for-broonie' and merge it into my tree for -next so that you can merge its merge commit.
Then...you will not meet any conflict in your tree due to Jassi's arch/arm stuff changes.

Maybe it will be done tomorrow morning(KST)...
If any concerns or opinions, please let me know.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

  reply	other threads:[~2010-10-25  2:31 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-22  8:30 [PATCHv2] ASoC: Overhaul Samsung drivers Jassi Brar
2010-10-22  8:31 ` [PATCH 01/24] ASoC: Samsung: Remove redundant AQUILA driver Jassi Brar
2010-10-22  8:32 ` [PATCH 02/24] ASoC: Samsung: Rename DMA device Jassi Brar
2010-10-22  8:34 ` [PATCH 03/24] ARM: Samsung: Define common audio-dma device Jassi Brar
2010-10-22  8:34 ` [PATCH 04/24] ASoC: Samsung: Rename ASoC DMA driver Jassi Brar
2010-10-22  8:34 ` [PATCH 05/24] ASoC: Samsung: Rename AC97 platform device Jassi Brar
2010-10-22  8:35 ` [PATCH 06/24] ASoC: Samsung: Rename AC97 driver Jassi Brar
2010-10-22  8:35 ` [PATCH 07/24] ASoC: Samsung: Rename PCM driver Jassi Brar
2010-10-22  8:35 ` [PATCH 08/24] ASoC: Samsung: Generalize DMA driver namespace Jassi Brar
2010-10-22  8:35 ` [PATCH 09/24] ASoC: Samsung: Rename s3c64xx I2S device Jassi Brar
2010-10-22  8:35 ` [PATCH 10/24] ASoC: Samsung: Add common I2S driver Jassi Brar
2010-10-22  8:36 ` [PATCH 11/24] ARM: S3C64XX: I2S: Upgrade platform device Jassi Brar
2010-10-22  8:36 ` [PATCH 12/24] ARM: S5P64X0: " Jassi Brar
2010-10-22  8:36 ` [PATCH 13/24] ARM: S5P6442: " Jassi Brar
2010-10-22  8:37 ` [PATCH 14/24] ARM: S5PC100: " Jassi Brar
2010-10-22  8:37 ` [PATCH 15/24] ARM: S5PV210: " Jassi Brar
2010-10-22  8:37 ` [PATCH 16/24] ARM: S5PV310: Add audio platform devices Jassi Brar
2010-10-22  8:38 ` [PATCH 17/24] ASoC: SMARTQ: Move to use new I2S driver Jassi Brar
2010-10-22  8:39 ` [PATCH 18/24] ASoC: GONI: " Jassi Brar
2010-10-22  8:39 ` [PATCH 19/24] ASoC: SMDK64XX: " Jassi Brar
2010-10-22  8:39 ` [PATCH 20/24] ASoC: S3C64XX: Remove obsoleted I2S drivers Jassi Brar
2010-10-22  8:39 ` [PATCH 21/24] ASoC: SMDK64XX: Rename for other platforms Jassi Brar
2010-10-22  8:40 ` [PATCH 22/24] ASoC: SMDK_WM8580: Enable for SMDKC100 Jassi Brar
2010-10-22  8:40 ` [PATCH 23/24] ASoC: Samsung: Generalize Kconfig symbols Jassi Brar
2010-10-23  1:43   ` Kyungmin Park
2010-10-22  8:40 ` [PATCH 24/24] ASoC: Samsung: Rename from s3c24xx to samsung Jassi Brar
2010-10-23  1:39   ` Kyungmin Park
2010-10-22 14:08 ` [PATCHv2] ASoC: Overhaul Samsung drivers Kukjin Kim
2010-10-25  2:17   ` Jassi Brar
2010-10-25  2:31     ` Kukjin Kim [this message]
2010-10-25  7:20       ` Jassi Brar

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='017701cb73ec$b531b180$1f951480$%kim@samsung.com' \
    --to=kgene.kim@samsung.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=ben-linux@fluff.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=cw00.choi@samsung.com \
    --cc=jassi.brar@samsung.com \
    --cc=jassisinghbrar@gmail.com \
    --cc=june.bae@samsung.com \
    --cc=lrg@slimlogic.co.uk \
    --cc=mcuelenaere@gmail.com \
    --cc=sw.youn@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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