Subject: RE: linux-next: manual merge of the sound-asoc tree with the s5p tree

From: Kukjin Kim <[email-masked]>
Date: Tue, 12 Oct 2010 07:26:38 +0900

Stephen Rothwell wrote:
> 
> Hi Kgene,
> 
> On Mon, 11 Oct 2010 16:33:48 +0900 Kukjin Kim <[email-masked]>
> wrote:
> >
> > > Today's linux-next merge of the sound-asoc tree got a conflict in
> > > arch/arm/mach-s3c64xx/dev-audio.c between commit
> > > f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to
> using
> > > s3c_gpio_cfgpin_range()") from the s5p tree and commit
> > > e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix
> fallthrough
> > > bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
> > > tree.
> > >
> > Hmm...how can/should I handle for it?
> 
> Don't worry about it.  It is trivial and both I and Linus can take care
> of it.
> 
Hi Stephen :-)

Thank you so much.
Have a nice day ;-)

Best regards,
Kgene.
--
Kukjin Kim <[email-masked]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.