From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'MyungJoo Ham' <myungjoo.ham@samsung•com>,
'Kyungmin Park' <kyungmin.park@samsung•com>
Subject: RE: linux-next: manual merge of the s5p tree with Linus' tree
Date: Tue, 24 Jan 2012 21:27:17 +0900 [thread overview]
Message-ID: <02e501ccda93$82af3570$880da050$%kim@samsung.com> (raw)
In-Reply-To: <20120124132123.6957dd9c43aa692fa12e9c81@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi Stephen,
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-exynos/cpu.c between commit cc511b8d84d8 ("ARM: 7257/1:
> EXYNOS: introduce arch/arm/mach-exynos/common.[ch]") from Linus' tree and
> commit 566fcbb817fb ("ARM: EXYNOS: Add DMC1 and allow PPMU access for
> DMC") from the s5p tree.
>
> The former removes this file, so the latter patch now needs to be applied
> to arch/arm/mach-exynos/common.c (I think).
>
Yes, right. Let me fix it. Thanks.
> Maybe the s5p tree should be rebased onto v3.3-rc1 (or merged with it)
> since there are other conflicts as well due to duplicated patches (same
> patch different commit).
Yes, let me rebase my tree onto v3.3-rc1 and then will merge other branches for v3.4 ;)
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-01-24 12:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 2:21 linux-next: manual merge of the s5p tree with Linus' tree Stephen Rothwell
2012-01-24 12:27 ` Kukjin Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-07 0:29 Stephen Rothwell
2010-07-13 1:14 Stephen Rothwell
2010-07-13 2:29 ` Kukjin Kim
2010-07-13 0:54 Stephen Rothwell
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='02e501ccda93$82af3570$880da050$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=myungjoo.ham@samsung$(echo .)com \
--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