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 for Android: free password hash cracker in your pocket

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

Message-ID: <CAGF5oy_4W0smcW=-QthK6Xr1i3e6+kQz+_Tc2qUPqGROfhvhDA@mail.gmail.com>
Date:	Tue, 25 Sep 2012 18:20:46 +0300
From:	"Valentin, Eduardo" <eduardo.valentin@...com>
To:	Greg KH <greg@...ah.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Durgadoss R <durgadoss.r@...el.com>,
	Zhang Rui <rui.zhang@...el.com>
Subject: Re: linux-next: manual merge of the staging tree with the thermal tree

Hello,

On Tue, Sep 25, 2012 at 6:11 PM, Greg KH <greg@...ah.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
--
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/