From: Kukjin Kim <kgene.kim@samsung•com>
To: "'Rafael J. Wysocki'" <rjw@rjwysocki•net>,
'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Jonghwan Choi' <jhbird.choi@samsung•com>,
'Chanwoo Choi' <cw00.choi@samsung•com>
Subject: RE: linux-next: manual merge of the pm tree with the samsung tree
Date: Tue, 20 May 2014 09:27:58 +0900 [thread overview]
Message-ID: <013b01cf73c2$5bbe1fb0$133a5f10$@samsung.com> (raw)
In-Reply-To: <1911725.FzcK6v311f@vostro.rjw.lan>
Rafael J. Wysocki wrote:
>
> On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> >
> > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got conflicts in
> > drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
> > between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
> > from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
> > dev_err/info function instead of pr_err/info") from the pm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Thanks for fixing that Stephen!
>
Same here ;-)
> Kukjin, are you going to handle all Exynos cpufreq commits in the future?
>
If you're OK, would be better to us I think.
- Kukjin
next prev parent reply other threads:[~2014-05-20 0:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 2:51 linux-next: manual merge of the pm tree with the samsung tree Stephen Rothwell
2014-05-19 20:40 ` Rafael J. Wysocki
2014-05-20 0:27 ` Kukjin Kim [this message]
2014-05-20 12:48 ` Rafael J. Wysocki
2014-05-21 13:32 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2015-08-17 1:36 Stephen Rothwell
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='013b01cf73c2$5bbe1fb0$133a5f10$@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=cw00.choi@samsung$(echo .)com \
--cc=jhbird.choi@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/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