From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>
Subject: linux-next: manual merge of the s5p tree with Linus' tree
Date: Tue, 24 Jan 2012 13:21:23 +1100 [thread overview]
Message-ID: <20120124132123.6957dd9c43aa692fa12e9c81@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
Hi Kukjin,
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).
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-01-24 2:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 2:21 Stephen Rothwell [this message]
2012-01-24 12:27 ` Kukjin Kim
-- 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=20120124132123.6957dd9c43aa692fa12e9c81@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
/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
all inboxes | Powered by JetHome®