linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Cooper <jason@lakedaemon.net>,
	andrew@lunn.ch, gregory.clement@free-electrons.com,
	linux-arm-kernel@lists.infradead.org,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Rob Herring <robh@kernel.org>,
	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Tue, 6 May 2014 11:07:58 +1000	[thread overview]
Message-ID: <20140506110758.9ddcae1a0fa3b9548e37bc58@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu:
clean-up unneeded kconfig selects") from the arm-soc tree and commit
8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada
38x") from the mvebu tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-mvebu/Kconfig
index bfc5af18e483,d6b0a772a6dd..000000000000
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -3,8 -3,10 +3,9 @@@ config ARCH_MVEB
  	select ARCH_SUPPORTS_BIG_ENDIAN
  	select CLKSRC_MMIO
  	select GENERIC_IRQ_CHIP
 -	select IRQ_DOMAIN
  	select PINCTRL
  	select PLAT_ORION
+ 	select SOC_BUS
  	select MVEBU_MBUS
  	select ZONE_DMA if ARM_LPAE
  	select ARCH_REQUIRE_GPIOLIB
@@@ -36,6 -39,10 +37,9 @@@ config MACH_ARMADA_37
  	select ARM_ERRATA_753970
  	select ARM_GIC
  	select ARMADA_375_CLK
 -	select CPU_V7
+ 	select HAVE_ARM_SCU
+ 	select HAVE_ARM_TWD if SMP
+ 	select HAVE_SMP
  	select MACH_MVEBU_V7
  	select PINCTRL_ARMADA_375
  	help
@@@ -48,6 -55,10 +52,9 @@@ config MACH_ARMADA_38
  	select ARM_ERRATA_753970
  	select ARM_GIC
  	select ARMADA_38X_CLK
 -	select CPU_V7
+ 	select HAVE_ARM_SCU
+ 	select HAVE_ARM_TWD if SMP
+ 	select HAVE_SMP
  	select MACH_MVEBU_V7
  	select PINCTRL_ARMADA_38X
  	help

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-05-06  1:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06  1:07 Stephen Rothwell [this message]
2014-05-06  1:13 ` linux-next: manual merge of the mvebu tree with the arm-soc tree Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:41 Stephen Rothwell
2022-05-10 13:59 ` Krzysztof Kozlowski
2022-05-10 14:42   ` Arnd Bergmann
2018-05-16 22:47 Stephen Rothwell
2017-04-11 22:34 Stephen Rothwell
2017-04-12  8:23 ` Gregory CLEMENT
2017-04-12 10:51   ` Stephen Rothwell
2016-04-13 23:29 Stephen Rothwell
2016-02-17 23:33 Stephen Rothwell
2015-12-02 11:12 Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:21   ` Arnd Bergmann
2015-12-02 13:49     ` Gregory CLEMENT
2015-12-02 15:09       ` Arnd Bergmann
2015-10-31 23:35 Stephen Rothwell
2015-01-13  0:20 Stephen Rothwell
2015-01-13  1:05 ` Andrew Lunn
2014-03-18  0:21 Stephen Rothwell
2014-02-26  1:46 Stephen Rothwell
2013-08-19  6:05 Stephen Rothwell
2013-08-19 20:57 ` Jason Cooper
2013-08-19 21:09   ` Olof Johansson
2013-08-19 21:38     ` Jason Cooper

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=20140506110758.9ddcae1a0fa3b9548e37bc58@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=andrew@lunn.ch \
    --cc=arnd@arndb.de \
    --cc=gregory.clement@free-electrons.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=robh@kernel.org \
    --cc=thomas.petazzoni@free-electrons.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).