From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
'Mark Brown' <broonie@opensource•wolfsonmicro.com>,
'Liam Girdwood' <lrg@slimlogic•co.uk>
Cc: 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-asoc tree with the s5p tree
Date: Fri, 31 Dec 2010 10:59:47 +0900 [thread overview]
Message-ID: <011301cba88e$69bff000$3d3fd000$%kim@samsung.com> (raw)
In-Reply-To: <20101231115609.53355fc7.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi all,
>
Hi :-)
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/plat-samsung/include/plat/devs.h between commit
> 1b6e8eda6f0e7cd4f28e522a5e77e76f6985af9d ("Merge branch 'next-s5pv310'
> into for-next") from the s5p tree and commit
> 83e37b8e400ca51cc97946815b3055daacd92fa8 ("ARM: Samsung: Define common
> audio-dma device") from the sound-asoc tree.
>
Oops, sorry for bothering again :-(
I will re-merge it in my for-next for avoiding conflict.
> I fixed it up (see below) and can carry the fix as necessary.
Thanks for your information and Happy New year!
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-31 1:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-31 0:56 linux-next: manual merge of the sound-asoc tree with the s5p tree Stephen Rothwell
2010-12-31 1:59 ` Kukjin Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-12-05 2:01 Stephen Rothwell
2011-12-05 10:28 ` Mark Brown
2010-10-11 2:35 Stephen Rothwell
2010-10-11 7:33 ` Kukjin Kim
2010-10-11 8:33 ` Stephen Rothwell
2010-10-11 22:26 ` Kukjin Kim
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='011301cba88e$69bff000$3d3fd000$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=jassi.brar@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lrg@slimlogic$(echo .)co.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/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