* linux-next: manual merge of the staging tree with the thermal tree
@ 2012-09-12 5:52 Stephen Rothwell
2012-09-12 8:11 ` Valentin, Eduardo
2012-09-12 16:13 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-09-12 5:52 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Eduardo Valentin, Zhang Rui
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/omap-thermal/omap-thermal-common.c between commit
76f726fb24bd ("Thermal: Remove tc1/tc2 in generic thermal layer") from
the thermal tree and commit 765a1939a364 ("staging: omap-thermal: fix
polling period settings") from the staging tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/omap-thermal/omap-thermal-common.c
index b4cd6cc,46ee0a9..0000000
--- a/drivers/staging/omap-thermal/omap-thermal-common.c
+++ b/drivers/staging/omap-thermal/omap-thermal-common.c
@@@ -248,7 -268,9 +270,8 @@@ int omap_thermal_expose_sensor(struct o
/* Create thermal zone */
data->omap_thermal = thermal_zone_device_register(domain,
OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
- 0, FAST_TEMP_MONITORING_RATE);
- 1, 2, /*TODO: remove this when FW allows */
+ FAST_TEMP_MONITORING_RATE,
+ FAST_TEMP_MONITORING_RATE);
if (IS_ERR_OR_NULL(data->omap_thermal)) {
dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
return PTR_ERR(data->omap_thermal);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the staging tree with the thermal tree
2012-09-12 5:52 linux-next: manual merge of the staging tree with the thermal tree Stephen Rothwell
@ 2012-09-12 8:11 ` Valentin, Eduardo
2012-09-12 16:13 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Valentin, Eduardo @ 2012-09-12 8:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, Zhang Rui
Hello Stephen,
On Wed, Sep 12, 2012 at 8:52 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/omap-thermal/omap-thermal-common.c between commit
> 76f726fb24bd ("Thermal: Remove tc1/tc2 in generic thermal layer") from
> the thermal tree and commit 765a1939a364 ("staging: omap-thermal: fix
> polling period settings") from the staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
Just to confirm that the fix is correct.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/staging/omap-thermal/omap-thermal-common.c
> index b4cd6cc,46ee0a9..0000000
> --- a/drivers/staging/omap-thermal/omap-thermal-common.c
> +++ b/drivers/staging/omap-thermal/omap-thermal-common.c
> @@@ -248,7 -268,9 +270,8 @@@ int omap_thermal_expose_sensor(struct o
> /* Create thermal zone */
> data->omap_thermal = thermal_zone_device_register(domain,
> OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
> - 0, FAST_TEMP_MONITORING_RATE);
> - 1, 2, /*TODO: remove this when FW allows */
> + FAST_TEMP_MONITORING_RATE,
> + FAST_TEMP_MONITORING_RATE);
> if (IS_ERR_OR_NULL(data->omap_thermal)) {
> dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
> return PTR_ERR(data->omap_thermal);
--
Eduardo Valentin
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the staging tree with the thermal tree
2012-09-12 5:52 linux-next: manual merge of the staging tree with the thermal tree Stephen Rothwell
2012-09-12 8:11 ` Valentin, Eduardo
@ 2012-09-12 16:13 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2012-09-12 16:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Eduardo Valentin, Zhang Rui
On Wed, Sep 12, 2012 at 03:52:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/omap-thermal/omap-thermal-common.c between commit
> 76f726fb24bd ("Thermal: Remove tc1/tc2 in generic thermal layer") from
> the thermal tree and commit 765a1939a364 ("staging: omap-thermal: fix
> polling period settings") from the staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
>
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the staging tree with the thermal tree
@ 2012-09-25 6:13 Stephen Rothwell
2012-09-25 15:11 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-09-25 6:13 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Eduardo Valentin, Durgadoss R, Zhang Rui
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/omap-thermal/omap-thermal-common.c between commit
82d3a76a88cd ("Thermal: Pass zone parameters as argument to
tzd_register") from the thermal tree and commit 765a1939a364 ("staging:
omap-thermal: fix polling period settings") from the staging tree.
I just used the thermal tree version and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the staging tree with the thermal tree
2012-09-25 6:13 Stephen Rothwell
@ 2012-09-25 15:11 ` Greg KH
2012-09-25 15:20 ` Valentin, Eduardo
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2012-09-25 15:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Eduardo Valentin, Durgadoss R, Zhang Rui
On Tue, Sep 25, 2012 at 04:13:55PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/omap-thermal/omap-thermal-common.c between commit
> 82d3a76a88cd ("Thermal: Pass zone parameters as argument to
> tzd_register") from the thermal tree and commit 765a1939a364 ("staging:
> omap-thermal: fix polling period settings") from the staging tree.
>
> I just used the thermal tree version and can carry the fix as necessary
> (no action is required).
That sounds correct to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the staging tree with the thermal tree
2012-09-25 15:11 ` Greg KH
@ 2012-09-25 15:20 ` Valentin, Eduardo
0 siblings, 0 replies; 6+ messages in thread
From: Valentin, Eduardo @ 2012-09-25 15:20 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel, Durgadoss R, Zhang Rui
Hello,
On Tue, Sep 25, 2012 at 6:11 PM, Greg KH <greg@kroah.com> wrote:
>
> On Tue, Sep 25, 2012 at 04:13:55PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/omap-thermal/omap-thermal-common.c between commit
> > 82d3a76a88cd ("Thermal: Pass zone parameters as argument to
> > tzd_register") from the thermal tree and commit 765a1939a364 ("staging:
> > omap-thermal: fix polling period settings") from the staging tree.
> >
> > I just used the thermal tree version and can carry the fix as necessary
> > (no action is required).
>
> That sounds correct to me, thanks.
Sounds good to me as well.
>
> greg k-h
--
Eduardo Valentin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-25 15:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-12 5:52 linux-next: manual merge of the staging tree with the thermal tree Stephen Rothwell
2012-09-12 8:11 ` Valentin, Eduardo
2012-09-12 16:13 ` Greg KH
2012-09-25 6:13 Stephen Rothwell
2012-09-25 15:11 ` Greg KH
2012-09-25 15:20 ` Valentin, Eduardo
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).