From: "Valentin, Eduardo" <eduardo.valentin@ti.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Durgadoss R <durgadoss.r@intel.com>,
Zhang Rui <rui.zhang@intel.com>
Subject: Re: linux-next: manual merge of the staging tree with the thermal tree
Date: Tue, 25 Sep 2012 18:20:46 +0300 [thread overview]
Message-ID: <CAGF5oy_4W0smcW=-QthK6Xr1i3e6+kQz+_Tc2qUPqGROfhvhDA@mail.gmail.com> (raw)
In-Reply-To: <20120925151103.GB18777@kroah.com>
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
next prev parent reply other threads:[~2012-09-25 15:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 6:13 linux-next: manual merge of the staging tree with the thermal tree Stephen Rothwell
2012-09-25 15:11 ` Greg KH
2012-09-25 15:20 ` Valentin, Eduardo [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-12 5:52 Stephen Rothwell
2012-09-12 8:11 ` Valentin, Eduardo
2012-09-12 16:13 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGF5oy_4W0smcW=-QthK6Xr1i3e6+kQz+_Tc2qUPqGROfhvhDA@mail.gmail.com' \
--to=eduardo.valentin@ti.com \
--cc=durgadoss.r@intel.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).