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,
Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the s5p tree with the arm-current tree
Date: Fri, 10 Sep 2010 11:10:23 +1000 [thread overview]
Message-ID: <20100910111023.671fdba7.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/Kconfig between commit 9e84ed63dc71e13b62cea5ec6b0049260cca0b7a
("ARM: Partially revert "Auto calculate ZRELADDR and provide option for
exceptions"") from the arm-current tree and commit
03c1ebb0c4e84c4de78f522a73fe1e813b9a1fc1 ("ARM: S5P64X0: Update Kconfig
and Makefile") from the s5p tree.
I used the arm-current version, but there may be some fix required for
the s5p tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-10 1:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 1:10 Stephen Rothwell [this message]
2010-09-10 23:03 ` linux-next: manual merge of the s5p tree with the arm-current tree Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2011-12-27 23:33 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=20100910111023.671fdba7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
/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