From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Stephen Rothwell' <sfr@canb.auug.org.au>, 'Chris Ball' <cjb@laptop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
'Jaehoon Chung' <jh80.chung@samsung.com>,
'Kyungmin Park' <kyungmin.park@samsung.com>,
'Thomas Abraham' <thomas.abraham@linaro.org>
Subject: RE: linux-next: manual merge of the mmc tree with the s5p tree
Date: Wed, 22 Feb 2012 11:19:28 +0900 [thread overview]
Message-ID: <012701ccf108$67a1ef80$36e5ce80$%kim@samsung.com> (raw)
In-Reply-To: <20120222124915.9414928ca50d8b181820c733@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Chris,
>
Hi Stephen,
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-s3c.c between commit bd0955ed6b1b ("mmc:
> sdhci-s3c: add platform data for the second capability") from the s5p
> tree and commit 7880741a0625 ("mmc: sdhci-s3c: derive transfer width host
> capability from max_width in platform data") from the mmc tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Look ok to me, and let me carry following when it is required.
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:[~2012-02-22 2:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 1:49 linux-next: manual merge of the mmc tree with the s5p tree Stephen Rothwell
2012-02-22 2:19 ` Kukjin Kim [this message]
2012-02-22 2:32 ` Kyungmin Park
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 3:59 Stephen Rothwell
2012-03-27 3:10 Stephen Rothwell
2012-03-27 3:29 ` Chris Ball
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='012701ccf108$67a1ef80$36e5ce80$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=cjb@laptop.org \
--cc=jh80.chung@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thomas.abraham@linaro.org \
/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