* linux-next: manual merge of the cpufreq tree with the s5p tree
@ 2011-03-11 2:35 Stephen Rothwell
2011-03-11 2:41 ` Dave Jones
2011-03-11 3:32 ` Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-11 2:35 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-next, linux-kernel, Rafael J. Wysocki, Kukjin Kim
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
arch/arm/mach-exynos4/cpufreq.c between commit 7d30e8b3815f ("ARM:
EXYNOS4: Add EXYNOS4 CPU initialization support") from the s5p tree and
commit 44033b9c940e ([CPUFREQ] Remove the pm_message_t argument from
driver suspend"") from the cpufreq tree (where this file is called
arch/arm/mach-s5pv310/cpufreq.c).
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/mach-exynos4/cpufreq.c
index a16ac35,7c08ad7..0000000
--- a/arch/arm/mach-exynos4/cpufreq.c
+++ b/arch/arm/mach-exynos4/cpufreq.c
@@@ -452,8 -458,7 +452,7 @@@ static int exynos4_target(struct cpufre
}
#ifdef CONFIG_PM
- static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy,
- pm_message_t pmsg)
-static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy)
++static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy)
{
return 0;
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the cpufreq tree with the s5p tree
2011-03-11 2:35 linux-next: manual merge of the cpufreq tree with the s5p tree Stephen Rothwell
@ 2011-03-11 2:41 ` Dave Jones
2011-03-11 3:46 ` Kukjin Kim
2011-03-11 3:32 ` Stephen Rothwell
1 sibling, 1 reply; 5+ messages in thread
From: Dave Jones @ 2011-03-11 2:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Rafael J. Wysocki, Kukjin Kim
On Fri, Mar 11, 2011 at 01:35:42PM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the cpufreq tree got a conflict in
> arch/arm/mach-exynos4/cpufreq.c between commit 7d30e8b3815f ("ARM:
> EXYNOS4: Add EXYNOS4 CPU initialization support") from the s5p tree and
> commit 44033b9c940e ([CPUFREQ] Remove the pm_message_t argument from
> driver suspend"") from the cpufreq tree (where this file is called
> arch/arm/mach-s5pv310/cpufreq.c).
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yep, Looks fine to me. thanks.
Dave
^ permalink raw reply [flat|nested] 5+ messages in thread* RE: linux-next: manual merge of the cpufreq tree with the s5p tree
2011-03-11 2:41 ` Dave Jones
@ 2011-03-11 3:46 ` Kukjin Kim
0 siblings, 0 replies; 5+ messages in thread
From: Kukjin Kim @ 2011-03-11 3:46 UTC (permalink / raw)
To: 'Dave Jones', 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Rafael J. Wysocki'
Dave Jones wrote:
>
> On Fri, Mar 11, 2011 at 01:35:42PM +1100, Stephen Rothwell wrote:
> > Hi Dave,
> >
> > Today's linux-next merge of the cpufreq tree got a conflict in
> > arch/arm/mach-exynos4/cpufreq.c between commit 7d30e8b3815f ("ARM:
> > EXYNOS4: Add EXYNOS4 CPU initialization support") from the s5p tree and
> > commit 44033b9c940e ([CPUFREQ] Remove the pm_message_t argument from
> > driver suspend"") from the cpufreq tree (where this file is called
> > arch/arm/mach-s5pv310/cpufreq.c).
> >
> > Just context changes. I fixed it up (see below) and can carry the fix
as
> > necessary.
>
> Yep, Looks fine to me. thanks.
>
> Dave
Of course, it's ok to me too.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the cpufreq tree with the s5p tree
2011-03-11 2:35 linux-next: manual merge of the cpufreq tree with the s5p tree Stephen Rothwell
2011-03-11 2:41 ` Dave Jones
@ 2011-03-11 3:32 ` Stephen Rothwell
2011-03-11 3:48 ` Kukjin Kim
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-11 3:32 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-next, linux-kernel, Rafael J. Wysocki, Kukjin Kim
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
Hi all,
On Fri, 11 Mar 2011 13:35:42 +1100 Stephen Rothwell <sfr@au1•ibm.com> wrote:
>
Please do not reply to the sender address on the preceding email (the
ibm.com one), please reply to this one instead. Sorry for the
inconvenience.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: linux-next: manual merge of the cpufreq tree with the s5p tree
2011-03-11 3:32 ` Stephen Rothwell
@ 2011-03-11 3:48 ` Kukjin Kim
0 siblings, 0 replies; 5+ messages in thread
From: Kukjin Kim @ 2011-03-11 3:48 UTC (permalink / raw)
To: 'Stephen Rothwell', 'Dave Jones'
Cc: linux-next, linux-kernel, 'Rafael J. Wysocki'
Stephen Rothwell wrote:
>
> Hi all,
>
> On Fri, 11 Mar 2011 13:35:42 +1100 Stephen Rothwell <sfr@au1•ibm.com>
wrote:
> >
>
> Please do not reply to the sender address on the preceding email (the
> ibm.com one), please reply to this one instead. Sorry for the
> inconvenience.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
Oops, sorry. I did :(
I read this after that.
Sorry for bothering....
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-11 3:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-11 2:35 linux-next: manual merge of the cpufreq tree with the s5p tree Stephen Rothwell
2011-03-11 2:41 ` Dave Jones
2011-03-11 3:46 ` Kukjin Kim
2011-03-11 3:32 ` Stephen Rothwell
2011-03-11 3:48 ` Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox