From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Zhang Rui <rui.zhang@intel.com>
Cc: linux-next <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Amit Kachhap <amit.kachhap@linaro.org>,
guenter.roeck@ericsson.com, akpm@linux-foundation.org
Subject: Re: thermal patches in linux-next
Date: Mon, 06 Aug 2012 21:40:32 -0700 (PDT) [thread overview]
Message-ID: <87y5lrtiv6.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <1344308038.1682.637.camel@rui.sh.intel.com>
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 <kuninori.morimoto.gx@renesas.com>
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 <kuninori.morimoto.gx@renesas.com>
---
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
next prev parent reply other threads:[~2012-08-07 4:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 2:53 thermal patches in linux-next Zhang Rui
2012-08-07 4:40 ` Kuninori Morimoto [this message]
2012-08-07 12:13 ` Amit Kachhap
[not found] ` <1344494746.1682.669.camel@rui.sh.intel.com>
2012-08-09 23:08 ` Stephen Rothwell
2012-08-10 1:41 ` Zhang Rui
2012-08-10 2:23 ` Stephen Rothwell
2012-08-10 2:44 ` Zhang Rui
2012-08-10 5:07 ` Amit Kachhap
2012-08-10 5:51 ` Zhang Rui
2012-08-14 6:15 ` Amit Kachhap
[not found] ` <CAK44p23u18MsDxPL_NkZqJLpstJJAGTfxDP4SCSuFuYzQq8-oA@mail.gmail.com>
2012-08-17 0:42 ` Zhang Rui
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=87y5lrtiv6.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=akpm@linux-foundation.org \
--cc=amit.kachhap@linaro.org \
--cc=guenter.roeck@ericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).