From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Eduardo Valentin <eduardo.valentin@ti.com>,
Zhang Rui <rui.zhang@intel.com>
Subject: Re: linux-next: manual merge of the staging tree with the thermal tree
Date: Wed, 12 Sep 2012 09:13:51 -0700 [thread overview]
Message-ID: <20120912161351.GD7273@kroah.com> (raw)
In-Reply-To: <20120912155231.716530c364bb20bd43efec0d@canb.auug.org.au>
On Wed, Sep 12, 2012 at 03:52:31PM +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
> 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).
>
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2012-09-12 16:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 5:52 linux-next: manual merge of the staging tree with the thermal tree Stephen Rothwell
2012-09-12 8:11 ` Valentin, Eduardo
2012-09-12 16:13 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-25 6:13 Stephen Rothwell
2012-09-25 15:11 ` Greg KH
2012-09-25 15:20 ` Valentin, Eduardo
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=20120912161351.GD7273@kroah.com \
--to=greg@kroah.com \
--cc=eduardo.valentin@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.