From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Chander Kashyap <chander.kashyap@linaro.org>,
Sachin Kamat <sachin.kamat@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: linux-next: manual merge of the pm tree with the arm-soc tree
Date: Wed, 30 Jul 2014 12:23:05 +1000 [thread overview]
Message-ID: <20140730122305.7b1b7838@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1144 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/cpuidle/Kconfig.arm between commit 2aaafcdb6883 ("cpuidle:
big.LITTLE: Add ARCH_EXYNOS entry in config") from the arm-soc tree and
commit 6ee7f5dd57fc ("cpuidle: big_little: Fix build error") from the
pm 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/cpuidle/Kconfig.arm
index 33fc0ff0af1c,a186dec8e5df..000000000000
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@@ -1,9 -1,16 +1,10 @@@
#
# ARM CPU Idle drivers
#
-config ARM_ARMADA_370_XP_CPUIDLE
- bool "CPU Idle Driver for Armada 370/XP family processors"
- depends on ARCH_MVEBU
- help
- Select this to enable cpuidle on Armada 370/XP processors.
-
config ARM_BIG_LITTLE_CPUIDLE
bool "Support for ARM big.LITTLE processors"
- depends on ARCH_VEXPRESS_TC2_PM
+ depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS
+ depends on MCPM
select ARM_CPU_SUSPEND
select CPU_IDLE_MULTIPLE_DRIVERS
help
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-30 2:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-30 2:23 Stephen Rothwell [this message]
2014-07-30 12:55 ` linux-next: manual merge of the pm tree with the arm-soc tree Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2014-09-10 4:14 Stephen Rothwell
2014-09-10 4:18 Stephen Rothwell
2014-09-10 23:29 ` Rafael J. Wysocki
2016-04-29 1:18 Stephen Rothwell
2017-04-20 0:34 Stephen Rothwell
2017-04-20 0:38 ` Rafael J. Wysocki
2017-04-21 0:50 Stephen Rothwell
2017-04-21 0:54 Stephen Rothwell
2017-04-21 5:53 ` Arnd Bergmann
2017-04-21 6:39 ` santosh.shilimkar
2017-04-21 9:31 ` Arnd Bergmann
2017-04-21 21:02 ` santosh.shilimkar
2017-04-21 21:31 ` Rafael J. Wysocki
2017-04-21 21:50 ` Santosh Shilimkar
2017-04-21 21:44 ` Arnd Bergmann
2017-04-21 21:54 ` Santosh Shilimkar
2017-04-24 18:02 ` Dave Gerlach
2017-04-24 18:22 ` Santosh Shilimkar
2020-10-21 0:00 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=20140730122305.7b1b7838@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=chander.kashyap@linaro.org \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rjw@rjwysocki.net \
--cc=sachin.kamat@samsung.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