Messages in this thread | | | Date | Tue, 25 Sep 2012 08:11:03 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the thermal tree |
| |
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
| |