From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kevin Hilman <khilman@deeprootsystems•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Russell King <rmk@arm•linux.org.uk>,
Cyril Chemparathy <cyril@ti•com>
Subject: linux-next: manual merge of the davinci tree with the arm tree
Date: Wed, 19 May 2010 11:10:50 +1000 [thread overview]
Message-ID: <20100519111050.337181c4.sfr@canb.auug.org.au> (raw)
Hi Kevin,
Today's linux-next merge of the davinci tree got a conflict in
arch/arm/Kconfig between commit 717e7c2672e37253a4d3aa70e4716b5b0a658761
("ARM: remove 'select GENERIC_TIME'") from the arm tree and commit
b722049d7e60356fe04bcac6065a7c8b1c64c06f ("Davinci: allow SOCs based on
other ARM CPUs") from the davinci tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/Kconfig
index a07b6c4,1151d1a..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -760,9 -776,11 +760,8 @@@ config ARCH_NOMADI
config ARCH_DAVINCI
bool "TI DaVinci"
- select CPU_ARM926T
- select GENERIC_TIME
select GENERIC_CLOCKEVENTS
- select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
- select HAVE_CLK
select ZONE_DMA
select HAVE_IDE
select COMMON_CLKDEV
next reply other threads:[~2010-05-19 1:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-19 1:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-10-17 23:31 linux-next: manual merge of the davinci tree with the arm tree Stephen Rothwell
2010-10-18 0:01 ` Stephen Rothwell
2010-10-19 15:46 ` Kevin Hilman
2010-01-29 0:13 Stephen Rothwell
2010-01-29 23:33 ` Kevin Hilman
2010-01-30 1:26 ` 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=20100519111050.337181c4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cyril@ti$(echo .)com \
--cc=khilman@deeprootsystems$(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