From: Mark Brown <broonie@kernel.org>
To: Simon Horman <horms@verge.net.au>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the renesas tree with the arm-soc tree
Date: Wed, 2 Dec 2015 11:21:09 +0000 [thread overview]
Message-ID: <20151202112109.342837c08019e632b28020fc@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1078 bytes --]
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
commit 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from the
renesas tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/arm/mach-shmobile/Kconfig
index 0f25f8fa2692,4ed72b124235..000000000000
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -29,10 -31,11 +31,11 @@@ config ARCH_RMOBIL
select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU
- menuconfig ARCH_SHMOBILE_MULTI
+ menuconfig ARCH_RENESAS
- bool "Renesas ARM SoCs" if ARCH_MULTI_V7
- depends on MMU
+ bool "Renesas ARM SoCs"
+ depends on ARCH_MULTI_V7 && MMU
select ARCH_SHMOBILE
+ select ARCH_SHMOBILE_MULTI
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select ARM_GIC
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
next reply other threads:[~2015-12-02 11:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 11:21 Mark Brown [this message]
2015-12-02 11:35 ` linux-next: manual merge of the renesas tree with the arm-soc tree Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2016-02-24 22:07 Stephen Rothwell
2015-07-26 23:32 Stephen Rothwell
2015-07-26 23:27 Stephen Rothwell
2015-01-15 0:38 Stephen Rothwell
2015-01-15 8:44 ` Geert Uytterhoeven
2014-05-22 2:12 Stephen Rothwell
2013-12-15 23:47 Stephen Rothwell
2013-12-16 10:00 ` Nicolas Ferre
2013-12-17 0:19 ` Simon Horman
2014-01-04 5:11 ` Olof Johansson
2014-01-04 11:43 ` Stephen Rothwell
2014-01-05 5:54 ` Simon Horman
2014-01-06 9:44 ` Nicolas Ferre
2014-01-08 16:56 ` Mike Turquette
2013-04-19 6:59 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=20151202112109.342837c08019e632b28020fc@kernel.org \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yamada.masahiro@socionext.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;
as well as URLs for NNTP newsgroup(s).