From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kukjin Kim <kgene.kim@samsung•com>
Cc: 'Mark Brown' <broonie@opensource•wolfsonmicro.com>,
'Liam Girdwood' <lrg@slimlogic•co.uk>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Dimitris Papastamos' <dp@opensource•wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the s5p tree
Date: Mon, 11 Oct 2010 19:33:36 +1100 [thread overview]
Message-ID: <20101011193336.835d9f78.sfr@canb.auug.org.au> (raw)
In-Reply-To: <009201cb6916$a9441740$fbcc45c0$%kim@samsung.com>
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi Kgene,
On Mon, 11 Oct 2010 16:33:48 +0900 Kukjin Kim <kgene.kim@samsung•com> 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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-10-11 8:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 2:35 linux-next: manual merge of the sound-asoc tree with the s5p tree Stephen Rothwell
2010-10-11 7:33 ` Kukjin Kim
2010-10-11 8:33 ` Stephen Rothwell [this message]
2010-10-11 22:26 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2010-12-31 0:56 Stephen Rothwell
2010-12-31 1:59 ` Kukjin Kim
2011-12-05 2:01 Stephen Rothwell
2011-12-05 10:28 ` 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=20101011193336.835d9f78.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=dp@opensource$(echo .)wolfsonmicro.com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lrg@slimlogic$(echo .)co.uk \
/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