RE: linux-next: manual merge of the pm tree with the samsung tree
Rafael J. Wysocki wrote:
>
> On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote:
> > 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.
>
> OK, I'll leave them to you, then. Please ask Viresh for ACKs if needed. :-)
>
I will.
Thanks,
Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the pm tree with the samsung tree
Rafael J. Wysocki wrote: On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote: 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. OK, I'll leave them to you, then. Please ask Viresh for ACKs if needed. :-) I will. Thanks, Kukjin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the pm tree with the samsung tree
On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote:
> 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.
OK, I'll leave them to you, then. Please ask Viresh for ACKs if needed. :-)
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the pm tree with the samsung tree
On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote: 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. OK, I'll leave them to you, then. Please ask Viresh for ACKs if needed. :-) -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the pm tree with the samsung tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the pm tree with the samsung tree
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!
Kukjin, are you going to handle all Exynos cpufreq commits in the future?
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the pm tree with the samsung tree
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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the pm tree with the samsung tree
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! Kukjin, are you going to handle all Exynos cpufreq commits in the future? Rafael -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
