From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Dave Jones' <davej@redhat•com>, 'Stephen Rothwell' <sfr@au1•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"'Rafael J. Wysocki'" <rjw@sisk•pl>
Subject: RE: linux-next: manual merge of the cpufreq tree with the s5p tree
Date: Fri, 11 Mar 2011 12:46:30 +0900 [thread overview]
Message-ID: <00e901cbdf9e$f0842510$d18c6f30$%kim@samsung.com> (raw)
In-Reply-To: <20110311024101.GA29265@redhat.com>
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.
next prev parent reply other threads:[~2011-03-11 3:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2011-03-11 3:32 ` Stephen Rothwell
2011-03-11 3:48 ` Kukjin Kim
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='00e901cbdf9e$f0842510$d18c6f30$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=davej@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--cc=sfr@au1$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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