From: Kukjin Kim <kgene.kim@samsung.com>
To: "'Stephen Rothwell'" <sfr@canb.auug.org.au>,
"'Russell King'" <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"'Arnd Bergmann'" <arnd@arndb.de>
Subject: RE: linux-next: manual merge of the arm-current tree with Linus' tree
Date: Fri, 13 Jan 2012 09:59:49 +0900 [thread overview]
Message-ID: <033201ccd18e$a6bd5950$f4380bf0$%kim@samsung.com> (raw)
In-Reply-To: <20120113114951.7b7f131514437454e5682aa8@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Russell,
>
> Today's linux-next merge of the arm-current tree got a conflict in
> arch/arm/mach-exynos/common.c between (I think) commit 237c78beb8a9
> ("Merge branch 'depends/rmk/for-linus' into samsung/dt") from Linus' tree
> and commit 588ac27d3419 ("ARM: 7273/1: EXYNOS: Fix build error which was
> from common.c and old cpu.c") from the arm-current tree.
>
> So this arm-current fi is superceded by the merge above that is now in
> Linus' tree.
>
Oh, right. Now we don't need the commit 588ac27d3419.
Russell, could you please remove it in your tree?
> I fixed it up by ignoring the arm-current version.
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-13 1:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-13 0:49 Stephen Rothwell
2012-01-13 0:59 ` Kukjin Kim [this message]
2012-01-13 8:40 ` Russell King
2012-01-13 8:46 ` Kukjin Kim
2012-01-24 0:59 Stephen Rothwell
2013-07-12 0:34 Stephen Rothwell
2013-08-14 1:18 Stephen Rothwell
2013-08-14 10:01 ` Ingo Molnar
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='033201ccd18e$a6bd5950$f4380bf0$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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®