* linux-next: manual merge of the imx-mxs tree with the pm tree
@ 2013-04-04 5:18 Stephen Rothwell
2013-04-04 5:19 ` Viresh Kumar
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-04-04 5:18 UTC (permalink / raw)
To: Shawn Guo
Cc: linux-next, linux-kernel, Markus Pargmann, Viresh Kumar,
Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/cpufreq.c between commits b43a7ffbf33b ("cpufreq:
Notify all policy->cpus in cpufreq_notify_transition()") and eb2f50ff93f0
("cpufreq: drivers: Remove unnecessary assignments of policy-> members")
from the pm tree and commit 180cb7d6ab8c ("ARM: imx: Remove cpufreq
driver") from the imx-mxs tree.
The latter removed the file, so I just did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the imx-mxs tree with the pm tree
2013-04-04 5:18 linux-next: manual merge of the imx-mxs tree with the pm tree Stephen Rothwell
@ 2013-04-04 5:19 ` Viresh Kumar
0 siblings, 0 replies; 2+ messages in thread
From: Viresh Kumar @ 2013-04-04 5:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Shawn Guo, linux-next, linux-kernel, Markus Pargmann, Rafael J. Wysocki
On 4 April 2013 10:48, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/mach-imx/cpufreq.c between commits b43a7ffbf33b ("cpufreq:
> Notify all policy->cpus in cpufreq_notify_transition()") and eb2f50ff93f0
> ("cpufreq: drivers: Remove unnecessary assignments of policy-> members")
> from the pm tree and commit 180cb7d6ab8c ("ARM: imx: Remove cpufreq
> driver") from the imx-mxs tree.
>
> The latter removed the file, so I just did that and can carry the fix as
> necessary (no action is required).
Thanks. Looks correct.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-04 5:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-04 5:18 linux-next: manual merge of the imx-mxs tree with the pm tree Stephen Rothwell
2013-04-04 5:19 ` Viresh Kumar
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).