Hi, all,
I just created a git tree for catching all thermal changes.
http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
and I also created the next branch, which I'd like to be set for
linux-next inclusion, but don't know how.
And, I just saw that there are a couple of thermal patches in
linux-next, which I think it would be better if they can be re-based on
my next branch first.
For Guenter's and Kuninori's patch, I can take them directly, with few
changes.
Amit,
I really like the idea of generic cpufreq cooling. But can you please
rebase the patches on top of my next branch? the recent thermal changes
will make your patch much cleaner, as we discussed before. :)
thanks,
rui
Hi Zhang
Thank you for your hard work
> I just created a git tree for catching all thermal changes.
> http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
> and I also created the next branch, which I'd like to be set for
> linux-next inclusion, but don't know how.
>
> And, I just saw that there are a couple of thermal patches in
> linux-next, which I think it would be better if they can be re-based on
> my next branch first.
> For Guenter's and Kuninori's patch, I can take them directly, with few
> changes.
Thank you.
I tried merge your tree + linux-next/master , and tested it.
My driver needs additional patch
my driver on linux-next/master is 6d0c7e61d36a3b72e19d9c2d31bf36d11c57ed57.
additional patch is
========================================================================
Subject: [PATCH] thermal: rcaar_thermal: tidyup thermal_zone_device_register() parameter
From: Kuninori Morimoto <[email protected]>
Date: Tue, 7 Aug 2012 13:32:14 +0900
c56f5c0342dfee11a1a13d2f5bb7618de5b17590
(Thermal: Make Thermal trip points writeable)
added "mask", and
062f7fed5c79b3d2f7274fcd6f05f8c8f2fa5674
(Thermal: Remove tc1/tc2 in generic thermal layer.)
removed tc1/tc2 from thermal_zone_device_register()
This patch tidyup rcar_thereml driver.
Signed-off-by: Kuninori Morimoto <[email protected]>
---
drivers/thermal/rcar_thermal.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 2496b4f..f7a1b57 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -210,8 +210,8 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_free_priv;
}
- zone = thermal_zone_device_register("rcar_thermal", 0, priv,
- &rcar_thermal_zone_ops, 0, 0, 0, 0);
+ zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
+ &rcar_thermal_zone_ops, 0, 0);
if (IS_ERR(zone)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n");
ret = PTR_ERR(zone);
--
1.7.5.4
========================================================================
Best regards
---
Kuninori Morimoto
Hi,
Thanks Rui for creating the next tree. I will rebase my patches on top
of your tree and post them shortly.
Thanks,
Amit Daniel
On 7 August 2012 08:23, Zhang Rui <[email protected]> wrote:
> Hi, all,
>
> I just created a git tree for catching all thermal changes.
> http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
> and I also created the next branch, which I'd like to be set for
> linux-next inclusion, but don't know how.
>
> And, I just saw that there are a couple of thermal patches in
> linux-next, which I think it would be better if they can be re-based on
> my next branch first.
> For Guenter's and Kuninori's patch, I can take them directly, with few
> changes.
>
> Amit,
> I really like the idea of generic cpufreq cooling. But can you please
> rebase the patches on top of my next branch? the recent thermal changes
> will make your patch much cleaner, as we discussed before. :)
>
> thanks,
> rui
>
Hi Rui,
On Thu, 09 Aug 2012 14:45:46 +0800 Zhang Rui <[email protected]> wrote:
>
> On 二, 2012-08-07 at 10:53 +0800, Zhang Rui wrote:
> > Hi, all,
> >
> > I just created a git tree for catching all thermal changes.
> > http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
> > and I also created the next branch, which I'd like to be set for
> > linux-next inclusion, but don't know how.
> >
> I create a tree for thermal management,
> git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
>
> could you please include my next branch for linux-next?
Included from today.
> And could you please drop these commits
> ef25a0fe0087963c1611c1c8903886fbea053f76
> 09ec52fca274ba88d68df3198de92abdaaff417b
> ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> 66447fa993cbce56b4076f169a56f62350f6c7b8
> ec62abb8b46021ca9ee6b8692b26974ace9007f0
> 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> 851414b2249afd8c128d29912dfd7060eaea8932
> and pull my next branch instead?
That is not how linux-next normally works. Those commits are in Adnrew's
quilt series, so you need to ask him to drop them. However, because of
the way the akpm tree works, any duplicate patches will disappear from my
copy of Andrew's series.
> these commits either will be rebased or has been applied in my tree.
In this case, I will remove them if they conflict too much or you take
them (rebased) into your tree.
Andrew, any chance of a new mmotm series? I am still working off (a reduced
part) of the mmotm series from July 21 ...
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
[email protected]
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
Hi, Stephen,
On 五, 2012-08-10 at 09:08 +1000, Stephen Rothwell wrote:
> Hi Rui,
>
> On Thu, 09 Aug 2012 14:45:46 +0800 Zhang Rui <[email protected]> wrote:
> >
> > On 二, 2012-08-07 at 10:53 +0800, Zhang Rui wrote:
> > > Hi, all,
> > >
> > > I just created a git tree for catching all thermal changes.
> > > http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
> > > and I also created the next branch, which I'd like to be set for
> > > linux-next inclusion, but don't know how.
> > >
> > I create a tree for thermal management,
> > git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
> >
> > could you please include my next branch for linux-next?
>
> Included from today.
>
Thank you.
> > And could you please drop these commits
> > ef25a0fe0087963c1611c1c8903886fbea053f76
> > 09ec52fca274ba88d68df3198de92abdaaff417b
> > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> > 66447fa993cbce56b4076f169a56f62350f6c7b8
> > ec62abb8b46021ca9ee6b8692b26974ace9007f0
> > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> > 851414b2249afd8c128d29912dfd7060eaea8932
> > and pull my next branch instead?
>
> That is not how linux-next normally works. Those commits are in Adnrew's
> quilt series, so you need to ask him to drop them. However, because of
> the way the akpm tree works, any duplicate patches will disappear from my
> copy of Andrew's series.
>
Andrew,
could you please drop these patches?
these commits either will be or has been re-based on top of my tree.
thanks,
rui
>
> In this case, I will remove them if they conflict too much or you take
> them (rebased) into your tree.
>
> Andrew, any chance of a new mmotm series? I am still working off (a reduced
> part) of the mmotm series from July 21 ...
>
> Thanks for adding your subsystem tree as a participant of linux-next. As
> you may know, this is not a judgment of your code. The purpose of
> linux-next is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
>
> You will need to ensure that the patches/commits in your tree/series have
> been:
> * submitted under GPL v2 (or later) and include the Contributor's
> Signed-off-by,
> * posted to the relevant mailing list,
> * reviewed by you (or another maintainer of your subsystem tree),
> * successfully unit tested, and
> * destined for the current or next Linux merge window.
>
> Basically, this should be just what you would send to Linus (or ask him
> to fetch). It is allowed to be rebased if you deem it necessary.
>
Hi Rui,
On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui <[email protected]> wrote:
>
> > > And could you please drop these commits
> > > ef25a0fe0087963c1611c1c8903886fbea053f76
> > > 09ec52fca274ba88d68df3198de92abdaaff417b
> > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> > > 66447fa993cbce56b4076f169a56f62350f6c7b8
> > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
> > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> > > 851414b2249afd8c128d29912dfd7060eaea8932
> > > and pull my next branch instead?
> >
> > That is not how linux-next normally works. Those commits are in Adnrew's
> > quilt series, so you need to ask him to drop them. However, because of
> > the way the akpm tree works, any duplicate patches will disappear from my
> > copy of Andrew's series.
>
> could you please drop these patches?
> these commits either will be or has been re-based on top of my tree.
You should always quote the summary line of commits. Andrew is using
quilt to manage his patches and so those commit ids mean nothing to him
(and they have changed in today's linux-next anyway).
--
Cheers,
Stephen Rothwell [email protected]
On 五, 2012-08-10 at 12:23 +1000, Stephen Rothwell wrote:
> Hi Rui,
>
> On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui <[email protected]> wrote:
> >
> > > > And could you please drop these commits
> > > > ef25a0fe0087963c1611c1c8903886fbea053f76
> > > > 09ec52fca274ba88d68df3198de92abdaaff417b
> > > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> > > > 66447fa993cbce56b4076f169a56f62350f6c7b8
> > > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
> > > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> > > > 851414b2249afd8c128d29912dfd7060eaea8932
> > > > and pull my next branch instead?
> > >
> > > That is not how linux-next normally works. Those commits are in Adnrew's
> > > quilt series, so you need to ask him to drop them. However, because of
> > > the way the akpm tree works, any duplicate patches will disappear from my
> > > copy of Andrew's series.
> >
> > could you please drop these patches?
> > these commits either will be or has been re-based on top of my tree.
>
> You should always quote the summary line of commits. Andrew is using
> quilt to manage his patches and so those commit ids mean nothing to him
> (and they have changed in today's linux-next anyway).
>
got it.
Andrew,
could you please drop these patches from Amit for now?
ARM: exynos: add thermal sensor driver platform data support
thermal: exynos: register the tmu sensor with the kernel thermal layer
thermal: exynos5: add exynos5 thermal sensor driver support
hwmon: exynos4: move thermal sensor driver to driver/thermal directory
thermal: add generic cpufreq cooling implementation
these patches can not build because of the recent thermal changes, and
Amit agreed with me to re-base them on top of my tree.
thanks,
rui
On 10 August 2012 08:14, Zhang Rui <[email protected]> wrote:
> On 五, 2012-08-10 at 12:23 +1000, Stephen Rothwell wrote:
>> Hi Rui,
>>
>> On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui <[email protected]> wrote:
>> >
>> > > > And could you please drop these commits
>> > > > ef25a0fe0087963c1611c1c8903886fbea053f76
>> > > > 09ec52fca274ba88d68df3198de92abdaaff417b
>> > > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
>> > > > 66447fa993cbce56b4076f169a56f62350f6c7b8
>> > > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
>> > > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
>> > > > 851414b2249afd8c128d29912dfd7060eaea8932
>> > > > and pull my next branch instead?
>> > >
>> > > That is not how linux-next normally works. Those commits are in Adnrew's
>> > > quilt series, so you need to ask him to drop them. However, because of
>> > > the way the akpm tree works, any duplicate patches will disappear from my
>> > > copy of Andrew's series.
>> >
>> > could you please drop these patches?
>> > these commits either will be or has been re-based on top of my tree.
>>
>> You should always quote the summary line of commits. Andrew is using
>> quilt to manage his patches and so those commit ids mean nothing to him
>> (and they have changed in today's linux-next anyway).
>>
> got it.
>
> Andrew,
> could you please drop these patches from Amit for now?
>
> ARM: exynos: add thermal sensor driver platform data support
> thermal: exynos: register the tmu sensor with the kernel thermal layer
> thermal: exynos5: add exynos5 thermal sensor driver support
> hwmon: exynos4: move thermal sensor driver to driver/thermal directory
> thermal: add generic cpufreq cooling implementation
>
> these patches can not build because of the recent thermal changes, and
> Amit agreed with me to re-base them on top of my tree.
Or may be it is better to let them be in linux-next as it is and I
will create a separate adaptation patch to work with Zhang's new
thermal enhancements. Actually the above patches are being used
internally.
Thanks,
Amit Daniel
>
> thanks,
> rui
>
On 五, 2012-08-10 at 10:37 +0530, Amit Kachhap wrote:
> On 10 August 2012 08:14, Zhang Rui <[email protected]> wrote:
> > On 五, 2012-08-10 at 12:23 +1000, Stephen Rothwell wrote:
> >> Hi Rui,
> >>
> >> On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui <[email protected]> wrote:
> >> >
> >> > > > And could you please drop these commits
> >> > > > ef25a0fe0087963c1611c1c8903886fbea053f76
> >> > > > 09ec52fca274ba88d68df3198de92abdaaff417b
> >> > > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> >> > > > 66447fa993cbce56b4076f169a56f62350f6c7b8
> >> > > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
> >> > > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> >> > > > 851414b2249afd8c128d29912dfd7060eaea8932
> >> > > > and pull my next branch instead?
> >> > >
> >> > > That is not how linux-next normally works. Those commits are in Adnrew's
> >> > > quilt series, so you need to ask him to drop them. However, because of
> >> > > the way the akpm tree works, any duplicate patches will disappear from my
> >> > > copy of Andrew's series.
> >> >
> >> > could you please drop these patches?
> >> > these commits either will be or has been re-based on top of my tree.
> >>
> >> You should always quote the summary line of commits. Andrew is using
> >> quilt to manage his patches and so those commit ids mean nothing to him
> >> (and they have changed in today's linux-next anyway).
> >>
> > got it.
> >
> > Andrew,
> > could you please drop these patches from Amit for now?
> >
> > ARM: exynos: add thermal sensor driver platform data support
> > thermal: exynos: register the tmu sensor with the kernel thermal layer
> > thermal: exynos5: add exynos5 thermal sensor driver support
> > hwmon: exynos4: move thermal sensor driver to driver/thermal directory
> > thermal: add generic cpufreq cooling implementation
> >
> > these patches can not build because of the recent thermal changes, and
> > Amit agreed with me to re-base them on top of my tree.
>
> Or may be it is better to let them be in linux-next as it is and I
> will create a separate adaptation patch to work with Zhang's new
> thermal enhancements. Actually the above patches are being used
> internally.
>
well, as the patches has not been in Linus' tree, and they do not
compile, IMO, it would be better to fix it in the patch rather than
create an incremental one.
I can rewrite the generic cpufreq cooling patch if you do not have time
to.
thanks,
rui
> Thanks,
> Amit Daniel
>
> >
> > thanks,
> > rui
> >
On 10 August 2012 11:21, Zhang Rui <[email protected]> wrote:
> On 五, 2012-08-10 at 10:37 +0530, Amit Kachhap wrote:
>> On 10 August 2012 08:14, Zhang Rui <[email protected]> wrote:
>> > On 五, 2012-08-10 at 12:23 +1000, Stephen Rothwell wrote:
>> >> Hi Rui,
>> >>
>> >> On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui <[email protected]> wrote:
>> >> >
>> >> > > > And could you please drop these commits
>> >> > > > ef25a0fe0087963c1611c1c8903886fbea053f76
>> >> > > > 09ec52fca274ba88d68df3198de92abdaaff417b
>> >> > > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
>> >> > > > 66447fa993cbce56b4076f169a56f62350f6c7b8
>> >> > > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
>> >> > > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
>> >> > > > 851414b2249afd8c128d29912dfd7060eaea8932
>> >> > > > and pull my next branch instead?
>> >> > >
>> >> > > That is not how linux-next normally works. Those commits are in Adnrew's
>> >> > > quilt series, so you need to ask him to drop them. However, because of
>> >> > > the way the akpm tree works, any duplicate patches will disappear from my
>> >> > > copy of Andrew's series.
>> >> >
>> >> > could you please drop these patches?
>> >> > these commits either will be or has been re-based on top of my tree.
>> >>
>> >> You should always quote the summary line of commits. Andrew is using
>> >> quilt to manage his patches and so those commit ids mean nothing to him
>> >> (and they have changed in today's linux-next anyway).
>> >>
>> > got it.
>> >
>> > Andrew,
>> > could you please drop these patches from Amit for now?
>> >
>> > ARM: exynos: add thermal sensor driver platform data support
>> > thermal: exynos: register the tmu sensor with the kernel thermal layer
>> > thermal: exynos5: add exynos5 thermal sensor driver support
>> > hwmon: exynos4: move thermal sensor driver to driver/thermal directory
>> > thermal: add generic cpufreq cooling implementation
>> >
>> > these patches can not build because of the recent thermal changes, and
>> > Amit agreed with me to re-base them on top of my tree.
>>
>> Or may be it is better to let them be in linux-next as it is and I
>> will create a separate adaptation patch to work with Zhang's new
>> thermal enhancements. Actually the above patches are being used
>> internally.
>>
> well, as the patches has not been in Linus' tree, and they do not
> compile, IMO, it would be better to fix it in the patch rather than
> create an incremental one.
> I can rewrite the generic cpufreq cooling patch if you do not have time
> to.
Ok agreed Zhang. I am currently fixing my patches for the new
framework. Will submit everything in a couple of days.
Thanks,
Amit Daniel
>
> thanks,
> rui
>
>> Thanks,
>> Amit Daniel
>>
>> >
>> > thanks,
>> > rui
>> >
>
>
Hi, Amit,
On 四, 2012-08-16 at 17:17 +0530, Amit Kachhap wrote:
> Hi Zhang,
>
> I have rebased my patches over your tree and submitted them. Also I
> have added them in my tree
> git://git.linaro.org/people/amitdanielk/linux.git
> exynos_v6_thermal_tree.
>
> If required add them to your tree.
>
thanks for your work. I'll review them ASAP. :)
thanks,
rui
> Thanks,
> Amit Daniel
>
> On 14 August 2012 11:45, Amit Kachhap <[email protected]> wrote:
> > On 10 August 2012 11:21, Zhang Rui <[email protected]> wrote:
> >> On 五, 2012-08-10 at 10:37 +0530, Amit Kachhap wrote:
> >>> On 10 August 2012 08:14, Zhang Rui <[email protected]> wrote:
> >>> > On 五, 2012-08-10 at 12:23 +1000, Stephen Rothwell wrote:
> >>> >> Hi Rui,
> >>> >>
> >>> >> On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui
> <[email protected]> wrote:
> >>> >> >
> >>> >> > > > And could you please drop these commits
> >>> >> > > > ef25a0fe0087963c1611c1c8903886fbea053f76
> >>> >> > > > 09ec52fca274ba88d68df3198de92abdaaff417b
> >>> >> > > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> >>> >> > > > 66447fa993cbce56b4076f169a56f62350f6c7b8
> >>> >> > > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
> >>> >> > > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> >>> >> > > > 851414b2249afd8c128d29912dfd7060eaea8932
> >>> >> > > > and pull my next branch instead?
> >>> >> > >
> >>> >> > > That is not how linux-next normally works. Those commits
> are in Adnrew's
> >>> >> > > quilt series, so you need to ask him to drop them.
> However, because of
> >>> >> > > the way the akpm tree works, any duplicate patches will
> disappear from my
> >>> >> > > copy of Andrew's series.
> >>> >> >
> >>> >> > could you please drop these patches?
> >>> >> > these commits either will be or has been re-based on top of
> my tree.
> >>> >>
> >>> >> You should always quote the summary line of commits. Andrew is
> using
> >>> >> quilt to manage his patches and so those commit ids mean
> nothing to him
> >>> >> (and they have changed in today's linux-next anyway).
> >>> >>
> >>> > got it.
> >>> >
> >>> > Andrew,
> >>> > could you please drop these patches from Amit for now?
> >>> >
> >>> > ARM: exynos: add thermal sensor driver platform data support
> >>> > thermal: exynos: register the tmu sensor with the kernel thermal
> layer
> >>> > thermal: exynos5: add exynos5 thermal sensor driver support
> >>> > hwmon: exynos4: move thermal sensor driver to driver/thermal
> directory
> >>> > thermal: add generic cpufreq cooling implementation
> >>> >
> >>> > these patches can not build because of the recent thermal
> changes, and
> >>> > Amit agreed with me to re-base them on top of my tree.
> >>>
> >>> Or may be it is better to let them be in linux-next as it is and I
> >>> will create a separate adaptation patch to work with Zhang's new
> >>> thermal enhancements. Actually the above patches are being used
> >>> internally.
> >>>
> >> well, as the patches has not been in Linus' tree, and they do not
> >> compile, IMO, it would be better to fix it in the patch rather than
> >> create an incremental one.
> >> I can rewrite the generic cpufreq cooling patch if you do not have
> time
> >> to.
> > Ok agreed Zhang. I am currently fixing my patches for the new
> > framework. Will submit everything in a couple of days.
> >
> > Thanks,
> > Amit Daniel
> >>
> >> thanks,
> >> rui
> >>
> >>> Thanks,
> >>> Amit Daniel
> >>>
> >>> >
> >>> > thanks,
> >>> > rui
> >>> >
> >>
> >>
>