From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
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,
Soren Brinkmann <soren.brinkmann@xilinx.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Michal Simek <michal.simek@xilinx.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Fri, 28 Mar 2014 14:50:27 +1100 [thread overview]
Message-ID: <20140328145027.fef73dc688be565c6a6e9210@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 914 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/common.c between commit 016f4dcae81e ("ARM: zynq:
Split slcr in two parts") from the arm-soc tree and commit cd325295871f
("arm: zynq: Add support for cpufreq") from the tip 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-zynq/common.c
index dca60d5ba756,a39be8e80856..000000000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -73,8 -74,7 +75,9 @@@ static void __init zynq_init_machine(vo
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
platform_device_register(&zynq_cpuidle_device);
+ platform_device_register_full(&devinfo);
+
+ zynq_slcr_init();
}
static void __init zynq_timer_init(void)
[-- 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: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
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,
Soren Brinkmann <soren.brinkmann@xilinx.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Michal Simek <michal.simek@xilinx.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Fri, 28 Mar 2014 14:50:27 +1100 [thread overview]
Message-ID: <20140328145027.fef73dc688be565c6a6e9210@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 914 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/common.c between commit 016f4dcae81e ("ARM: zynq:
Split slcr in two parts") from the arm-soc tree and commit cd325295871f
("arm: zynq: Add support for cpufreq") from the tip 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-zynq/common.c
index dca60d5ba756,a39be8e80856..000000000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -73,8 -74,7 +75,9 @@@ static void __init zynq_init_machine(vo
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
platform_device_register(&zynq_cpuidle_device);
+ platform_device_register_full(&devinfo);
+
+ zynq_slcr_init();
}
static void __init zynq_timer_init(void)
[-- 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 tip tree with the arm-soc tree
Date: Fri, 28 Mar 2014 14:50:27 +1100 [thread overview]
Message-ID: <20140328145027.fef73dc688be565c6a6e9210@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/common.c between commit 016f4dcae81e ("ARM: zynq:
Split slcr in two parts") from the arm-soc tree and commit cd325295871f
("arm: zynq: Add support for cpufreq") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc arch/arm/mach-zynq/common.c
index dca60d5ba756,a39be8e80856..000000000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -73,8 -74,7 +75,9 @@@ static void __init zynq_init_machine(vo
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
platform_device_register(&zynq_cpuidle_device);
+ platform_device_register_full(&devinfo);
+
+ zynq_slcr_init();
}
static void __init zynq_timer_init(void)
-------------- 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/20140328/15e4d4b6/attachment-0001.sig>
next reply other threads:[~2014-03-28 3:50 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-28 3:50 Stephen Rothwell [this message]
2014-03-28 3:50 ` linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
2014-03-28 3:50 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 1:21 Stephen Rothwell
2023-01-16 1:21 ` Stephen Rothwell
2018-10-08 2:32 Stephen Rothwell
2018-10-08 2:32 ` Stephen Rothwell
2018-03-19 3:06 Stephen Rothwell
2018-03-19 3:06 ` Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-03-13 3:11 Stephen Rothwell
2018-03-13 3:11 ` Stephen Rothwell
2015-07-28 2:20 Stephen Rothwell
2015-07-28 2:20 ` Stephen Rothwell
2015-07-28 2:20 ` Stephen Rothwell
2014-09-26 6:25 Stephen Rothwell
2014-09-26 6:25 ` Stephen Rothwell
2014-09-26 6:25 ` Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-09-29 18:12 ` Tony Lindgren
2014-03-28 3:47 Stephen Rothwell
2014-03-28 3:47 ` Stephen Rothwell
2014-03-28 3:47 ` Stephen Rothwell
2014-03-28 3:39 Stephen Rothwell
2014-03-28 3:39 ` Stephen Rothwell
2014-03-28 3:39 ` Stephen Rothwell
2014-03-20 3:36 Stephen Rothwell
2014-03-20 3:36 ` Stephen Rothwell
2014-03-20 3:36 ` Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell
2014-03-17 5:37 Stephen Rothwell
2014-03-17 5:37 ` Stephen Rothwell
2014-03-17 5:37 ` Stephen Rothwell
2014-03-17 5:35 Stephen Rothwell
2014-03-17 5:35 ` Stephen Rothwell
2014-03-17 5:35 ` Stephen Rothwell
2014-03-17 16:41 ` Sören Brinkmann
2014-03-17 16:41 ` Sören Brinkmann
2014-03-17 16:41 ` Sören Brinkmann
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=20140328145027.fef73dc688be565c6a6e9210@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=mingo@elte.hu \
--cc=olof@lixom.net \
--cc=peterz@infradead.org \
--cc=soren.brinkmann@xilinx.com \
--cc=tglx@linutronix.de \
/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.