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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

On Tue, Sep 25, 2012 at 6:11 PM, Greg KH <greg@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux