linux-kernel - Re: linux-next: manual merge of the staging tree with the thermal tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 12 Sep 2012 11:11:55 +0300
From:	"Valentin, Eduardo" <eduardo.valentin@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Zhang Rui <rui.zhang@...el.com>
Subject: Re: linux-next: manual merge of the staging tree with the thermal tree

Hello Stephen,


On Wed, Sep 12, 2012 at 8:52 AM, Stephen Rothwell <sfr@...b.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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/