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>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jett.Zhou" <jtzhou@marvell.com>,
Haojian Zhuang <haojian.zhuang@marvell.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree
Date: Wed, 29 Feb 2012 16:16:27 +1100 [thread overview]
Message-ID: <20120229161627.b8dd92287d066cd7c0a0284e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 6905a65879b5 ("ARM: Make the sched_clock
framework mandatory") from the arm tree and commit 4a8f83409da6 ("ARM:
sa1100: clean up clock support") from the arm-soc tree.
Just context changes. 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 5130989,9f134c4..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -753,7 -760,8 +753,7 @@@ config ARCH_SA110
select ARCH_HAS_CPUFREQ
select CPU_FREQ
select GENERIC_CLOCKEVENTS
- select HAVE_CLK
+ select CLKDEV_LOOKUP
- select HAVE_SCHED_CLOCK
select TICK_ONESHOT
select ARCH_REQUIRE_GPIOLIB
select HAVE_IDE
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
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
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jett.Zhou" <jtzhou@marvell.com>,
Haojian Zhuang <haojian.zhuang@marvell.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree
Date: Wed, 29 Feb 2012 16:16:27 +1100 [thread overview]
Message-ID: <20120229161627.b8dd92287d066cd7c0a0284e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 6905a65879b5 ("ARM: Make the sched_clock
framework mandatory") from the arm tree and commit 4a8f83409da6 ("ARM:
sa1100: clean up clock support") from the arm-soc tree.
Just context changes. 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 5130989,9f134c4..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -753,7 -760,8 +753,7 @@@ config ARCH_SA110
select ARCH_HAS_CPUFREQ
select CPU_FREQ
select GENERIC_CLOCKEVENTS
- select HAVE_CLK
+ select CLKDEV_LOOKUP
- select HAVE_SCHED_CLOCK
select TICK_ONESHOT
select ARCH_REQUIRE_GPIOLIB
select HAVE_IDE
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the arm tree
Date: Wed, 29 Feb 2012 16:16:27 +1100 [thread overview]
Message-ID: <20120229161627.b8dd92287d066cd7c0a0284e@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 6905a65879b5 ("ARM: Make the sched_clock
framework mandatory") from the arm tree and commit 4a8f83409da6 ("ARM:
sa1100: clean up clock support") from the arm-soc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc arch/arm/Kconfig
index 5130989,9f134c4..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -753,7 -760,8 +753,7 @@@ config ARCH_SA110
select ARCH_HAS_CPUFREQ
select CPU_FREQ
select GENERIC_CLOCKEVENTS
- select HAVE_CLK
+ select CLKDEV_LOOKUP
- select HAVE_SCHED_CLOCK
select TICK_ONESHOT
select ARCH_REQUIRE_GPIOLIB
select HAVE_IDE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120229/14bcdab1/attachment.sig>
next reply other threads:[~2012-02-29 5:16 UTC|newest]
Thread overview: 236+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 5:16 Stephen Rothwell [this message]
2012-02-29 5:16 ` linux-next: manual merge of the arm-soc tree with the arm tree Stephen Rothwell
2012-02-29 5:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-02-28 0:16 Stephen Rothwell
2022-02-28 0:16 ` Stephen Rothwell
2021-02-01 22:01 Stephen Rothwell
2021-02-01 22:01 ` Stephen Rothwell
2021-02-14 22:14 ` Stephen Rothwell
2021-02-14 22:14 ` Stephen Rothwell
2021-02-20 19:45 ` Alain Volmat
2021-02-20 19:45 ` Alain Volmat
2021-02-21 0:28 ` Stephen Rothwell
2021-02-21 0:28 ` Stephen Rothwell
2021-02-21 22:03 ` Stephen Rothwell
2021-02-21 22:03 ` Stephen Rothwell
2019-08-29 23:27 Stephen Rothwell
2019-08-29 23:27 ` Stephen Rothwell
2019-08-30 12:29 ` Arnd Bergmann
2019-08-30 12:29 ` Arnd Bergmann
2018-05-29 23:40 Stephen Rothwell
2018-05-29 23:40 ` Stephen Rothwell
2018-05-23 12:25 Mark Brown
2018-05-23 12:25 ` Mark Brown
2018-05-23 12:25 ` Mark Brown
2017-01-17 22:49 Stephen Rothwell
2017-01-17 22:49 ` Stephen Rothwell
2017-01-17 22:49 ` Stephen Rothwell
2017-01-17 22:53 ` Florian Fainelli
2017-01-17 22:53 ` Florian Fainelli
2017-01-17 22:53 ` Florian Fainelli
2015-08-11 23:48 Stephen Rothwell
2015-08-11 23:48 ` Stephen Rothwell
2015-08-11 23:48 ` Stephen Rothwell
2015-08-11 23:53 ` Nicolas Pitre
2015-08-11 23:53 ` Nicolas Pitre
2015-09-02 0:47 ` Stephen Rothwell
2015-09-02 0:47 ` Stephen Rothwell
2015-09-02 0:47 ` Stephen Rothwell
2015-06-01 22:47 Stephen Rothwell
2015-06-01 22:47 ` Stephen Rothwell
2015-06-01 22:47 ` Stephen Rothwell
2015-01-29 22:55 Stephen Rothwell
2015-01-29 22:55 ` Stephen Rothwell
2015-01-29 22:55 ` Stephen Rothwell
2015-01-29 23:05 ` Russell King - ARM Linux
2015-01-29 23:05 ` Russell King - ARM Linux
2014-09-26 1:23 Stephen Rothwell
2014-09-26 1:23 ` Stephen Rothwell
2014-09-26 1:23 ` Stephen Rothwell
2014-09-26 8:18 ` Russell King - ARM Linux
2014-09-26 8:18 ` Russell King - ARM Linux
2014-09-26 9:27 ` Daniel Thompson
2014-09-26 9:27 ` Daniel Thompson
2014-09-26 13:52 ` Russell King - ARM Linux
2014-09-26 13:52 ` Russell King - ARM Linux
2014-09-26 8:19 ` Carlo Caione
2014-09-26 8:19 ` Carlo Caione
2014-09-26 8:39 ` Stephen Rothwell
2014-09-26 8:39 ` Stephen Rothwell
2014-07-25 0:13 Stephen Rothwell
2014-07-25 0:13 ` Stephen Rothwell
2014-07-25 0:13 ` Stephen Rothwell
2014-06-02 0:49 Stephen Rothwell
2014-06-02 0:49 ` Stephen Rothwell
2014-06-02 0:49 ` Stephen Rothwell
2014-06-02 3:28 ` Olof Johansson
2014-06-02 3:28 ` Olof Johansson
2014-06-02 3:28 ` Olof Johansson
2014-05-27 0:52 Stephen Rothwell
2014-05-27 0:52 ` Stephen Rothwell
2014-05-27 0:52 ` Stephen Rothwell
2014-05-27 0:48 Stephen Rothwell
2014-05-27 0:48 ` Stephen Rothwell
2014-05-27 0:48 ` Stephen Rothwell
2014-05-23 0:53 Stephen Rothwell
2014-05-23 0:53 ` Stephen Rothwell
2014-05-23 0:53 ` Stephen Rothwell
2014-05-23 0:45 Stephen Rothwell
2014-05-23 0:45 ` Stephen Rothwell
2014-05-23 0:45 ` Stephen Rothwell
2014-05-23 13:08 ` Gregory CLEMENT
2014-05-23 13:08 ` Gregory CLEMENT
2014-01-05 23:20 Stephen Rothwell
2014-01-05 23:20 ` Stephen Rothwell
2014-01-05 23:20 ` Stephen Rothwell
2013-08-15 4:36 Stephen Rothwell
2013-08-15 4:36 ` Stephen Rothwell
2013-08-15 4:36 ` Stephen Rothwell
2013-05-01 6:44 Stephen Rothwell
2013-05-01 6:44 ` Stephen Rothwell
2013-05-01 6:44 ` Stephen Rothwell
2012-11-26 10:31 Stephen Rothwell
2012-11-26 10:31 ` Stephen Rothwell
2012-11-26 10:31 ` Stephen Rothwell
2012-11-26 10:39 ` Nicolas Ferre
2012-11-26 10:39 ` Nicolas Ferre
2012-11-26 10:39 ` Nicolas Ferre
2012-09-27 5:48 Stephen Rothwell
2012-09-27 5:48 ` Stephen Rothwell
2012-09-27 5:48 ` Stephen Rothwell
2012-09-20 6:03 Stephen Rothwell
2012-09-20 6:03 ` Stephen Rothwell
2012-09-20 6:03 ` Stephen Rothwell
2012-09-20 7:04 ` Linus Walleij
2012-09-20 7:04 ` Linus Walleij
2012-05-16 8:50 Stephen Rothwell
2012-05-16 8:50 ` Stephen Rothwell
2012-05-16 8:50 ` Stephen Rothwell
2012-05-16 9:36 ` Haojian Zhuang
2012-05-16 9:36 ` Haojian Zhuang
2012-05-14 8:39 Stephen Rothwell
2012-05-14 8:39 ` Stephen Rothwell
2012-05-14 8:39 ` Stephen Rothwell
2012-05-03 5:35 Stephen Rothwell
2012-05-03 5:35 ` Stephen Rothwell
2012-05-03 5:35 ` Stephen Rothwell
2012-03-16 6:49 Stephen Rothwell
2012-03-16 6:49 ` Stephen Rothwell
2012-03-16 6:49 ` Stephen Rothwell
2012-03-16 8:31 ` Arnd Bergmann
2012-03-16 8:31 ` Arnd Bergmann
2012-03-15 7:06 Stephen Rothwell
2012-03-15 7:06 ` Stephen Rothwell
2012-03-15 7:06 ` Stephen Rothwell
2012-03-15 7:06 Stephen Rothwell
2012-03-15 7:06 ` Stephen Rothwell
2012-03-15 7:06 ` Stephen Rothwell
2012-03-15 6:56 Stephen Rothwell
2012-03-15 6:56 ` Stephen Rothwell
2012-03-15 6:56 ` Stephen Rothwell
2012-03-13 8:47 Stephen Rothwell
2012-03-13 8:47 ` Stephen Rothwell
2012-03-13 8:47 ` Stephen Rothwell
2012-03-13 8:42 Stephen Rothwell
2012-03-13 8:42 ` Stephen Rothwell
2012-03-13 8:42 ` Stephen Rothwell
2012-03-13 8:36 Stephen Rothwell
2012-03-13 8:36 ` Stephen Rothwell
2012-03-13 8:36 ` Stephen Rothwell
2012-02-09 23:50 Stephen Rothwell
2012-02-09 23:50 ` Stephen Rothwell
2012-02-09 23:50 ` Stephen Rothwell
2012-02-10 0:25 ` Olof Johansson
2012-02-10 0:25 ` Olof Johansson
2012-01-24 1:20 Stephen Rothwell
2012-01-24 1:20 ` Stephen Rothwell
2012-01-24 1:20 ` Stephen Rothwell
2012-01-06 1:03 Stephen Rothwell
2012-01-06 1:03 ` Stephen Rothwell
2012-01-06 1:03 ` Stephen Rothwell
2012-01-07 4:44 ` Shawn Guo
2012-01-07 4:44 ` Shawn Guo
2012-01-07 6:53 ` Stephen Rothwell
2012-01-07 6:53 ` Stephen Rothwell
2012-01-07 6:53 ` Stephen Rothwell
2012-01-07 5:48 ` Shawn Guo
2012-01-07 5:48 ` Shawn Guo
2012-01-07 6:48 ` Stephen Rothwell
2012-01-07 6:48 ` Stephen Rothwell
2012-01-06 1:03 Stephen Rothwell
2012-01-06 1:03 ` Stephen Rothwell
2012-01-06 1:03 ` Stephen Rothwell
2012-01-06 1:03 Stephen Rothwell
2012-01-06 1:03 ` Stephen Rothwell
2012-01-06 1:03 ` Stephen Rothwell
2012-01-06 8:48 ` Russell King - ARM Linux
2012-01-06 8:48 ` Russell King - ARM Linux
2012-01-06 10:31 ` Stephen Rothwell
2012-01-06 10:31 ` Stephen Rothwell
2012-01-05 0:27 Stephen Rothwell
2012-01-05 0:27 ` Stephen Rothwell
2012-01-05 0:27 ` Stephen Rothwell
2012-01-02 23:34 Stephen Rothwell
2012-01-02 23:34 ` Stephen Rothwell
2012-01-02 23:34 ` Stephen Rothwell
2011-12-18 23:55 Stephen Rothwell
2011-12-18 23:55 ` Stephen Rothwell
2011-12-18 23:55 ` Stephen Rothwell
2011-12-19 1:32 ` Shawn Guo
2011-12-19 1:32 ` Shawn Guo
2011-12-19 1:32 ` Shawn Guo
2011-12-18 23:55 Stephen Rothwell
2011-12-18 23:55 ` Stephen Rothwell
2011-12-18 23:55 ` Stephen Rothwell
2011-12-06 23:53 Stephen Rothwell
2011-12-07 2:59 ` Shawn Guo
2011-12-06 23:52 Stephen Rothwell
2011-12-07 2:57 ` Shawn Guo
2011-11-27 23:56 Stephen Rothwell
2011-11-28 19:11 ` Arnd Bergmann
2011-11-29 8:06 ` Tomi Valkeinen
2011-12-07 19:28 ` Tony Lindgren
2011-11-24 0:52 Stephen Rothwell
2011-11-24 15:54 ` Arnd Bergmann
2011-11-24 22:25 ` Shawn Guo
2011-11-25 17:08 ` Arnd Bergmann
2011-10-24 20:52 Stephen Rothwell
2011-10-24 20:45 Stephen Rothwell
2011-10-24 20:51 ` Russell King
2011-10-25 8:04 ` Marc Zyngier
2011-10-25 12:12 ` Marc Zyngier
2011-10-24 20:39 Stephen Rothwell
2011-10-24 20:48 ` Russell King
2011-10-24 21:08 ` Rob Herring
2011-10-24 20:20 Stephen Rothwell
2011-10-24 20:30 ` Russell King
2011-10-24 21:09 ` Sascha Hauer
2011-10-24 21:16 ` Russell King
2011-10-13 0:15 Stephen Rothwell
2011-10-13 0:11 Stephen Rothwell
2011-10-13 0:17 ` Stephen Rothwell
2011-10-04 0:08 Stephen Rothwell
2011-10-04 15:48 ` Stephen Warren
2011-10-04 19:33 ` Arnd Bergmann
2011-10-04 0:05 Stephen Rothwell
2011-09-27 1:25 Stephen Rothwell
2011-09-27 6:20 ` Tixy
2011-09-27 7:25 ` Russell King
2011-09-27 15:24 ` Arnd Bergmann
2011-09-27 21:23 ` Russell King
2011-09-22 1:49 Stephen Rothwell
2011-09-22 2:44 ` Nicolas Pitre
2011-09-12 2:05 Stephen Rothwell
2011-09-12 2:05 Stephen Rothwell
2011-09-12 2:05 Stephen Rothwell
2011-09-12 2:05 Stephen Rothwell
2011-09-12 2:18 ` Stephen Boyd
2011-09-13 1:55 ` Stephen Rothwell
2011-09-14 22:58 ` David Brown
2011-11-03 2:09 ` Stephen Rothwell
2011-11-03 2:22 ` David Brown
2011-11-03 15:10 ` Linus Torvalds
2011-08-29 1:04 Stephen Rothwell
2011-08-29 9:17 ` Linus Walleij
2011-07-16 5:07 Stephen Rothwell
2011-07-17 21:44 ` Arnd Bergmann
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=20120229161627.b8dd92287d066cd7c0a0284e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=haojian.zhuang@marvell.com \
--cc=jtzhou@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=olof@lixom.net \
--cc=rmk@arm.linux.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.