From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org,
Will Deacon <will.deacon@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Suzuki K. Poulose" <suzuki.poulose@arm•com>,
Geert Uytterhoeven <geert+renesas@glider•be>
Subject: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Date: Mon, 23 Mar 2015 11:33:18 +1100 [thread overview]
Message-ID: <20150323113318.0319c248@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/bus/Kconfig between commit c9966c98697a ("arm-cci: Split the
code for PMU vs driver support") from the arm-perf tree and commit
13fbf3c8d0f7 ("drivers: bus: Sort Kconfig entries alphabetically") from
the arm-soc 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 drivers/bus/Kconfig
index 79e297b1f221,7e9c2674af81..000000000000
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@@ -4,6 -4,21 +4,38 @@@
menu "Bus devices"
-config ARM_CCI
- bool "ARM CCI driver support"
++config ARM_CCI400_PORT_CTRL
++ bool
+ depends on ARM && OF && CPU_V7
++ select ARM_CCI400_COMMON
+ help
- Driver supporting the CCI cache coherent interconnect for ARM
- platforms.
++ Low level power management driver for CCI400 cache coherent
++ interconnect for ARM platforms.
++
++config ARM_CCI400_PMU
++ bool "ARM CCI400 PMU support"
++ default y
++ depends on ARM || ARM64
++ depends on HW_PERF_EVENTS
++ select ARM_CCI400_COMMON
++ help
++ Support for PMU events monitoring on the ARM CCI cache coherent
++ interconnect.
++
++ If unsure, say Y
++
++config ARM_CCI400_COMMON
++ bool
++ select ARM_CCI
+
+ config ARM_CCN
+ bool "ARM CCN driver support"
+ depends on ARM || ARM64
+ depends on PERF_EVENTS
+ help
+ PMU (perf) driver supporting the ARM CCN (Cache Coherent Network)
+ interconnect.
+
config BRCMSTB_GISB_ARB
bool "Broadcom STB GISB bus arbiter"
depends on ARM || MIPS
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-23 0:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 0:33 Stephen Rothwell [this message]
2015-03-23 14:41 ` linux-next: manual merge of the arm-soc tree with the arm-perf tree Abhilash Kesavan
2015-03-23 15:13 ` Suzuki K. Poulose
2015-03-23 21:16 ` Stephen Rothwell
2015-03-24 14:59 ` Suzuki K. Poulose
-- strict thread matches above, loose matches on Subject: below --
2024-01-02 23:03 Stephen Rothwell
2024-01-03 17:30 ` Will Deacon
2024-01-03 17:38 ` Arnd Bergmann
2014-02-21 0:58 Stephen Rothwell
2014-02-21 1:02 ` Olof Johansson
2014-02-21 11:09 ` Will Deacon
2014-02-22 0:46 ` Olof Johansson
2014-02-21 1:02 ` Stephen Boyd
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=20150323113318.0319c248@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=geert+renesas@glider$(echo .)be \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=will.deacon@arm$(echo .)com \
/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