From: Zhang Rui <rui.zhang@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Devendra Naga <develkernel412222@gmail.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Durgadoss R <durgadoss.r@intel.com>
Subject: Re: linux-next: manual merge of the thermal tree with Linus' tree
Date: Mon, 05 Nov 2012 09:17:55 +0800 [thread overview]
Message-ID: <1352078275.2492.0.camel@rzhang1-mobl4> (raw)
In-Reply-To: <20121105114644.fe54cba816860bf12f1de9cf@canb.auug.org.au>
On Mon, 2012-11-05 at 11:46 +1100, Stephen Rothwell wrote:
> Hi Zhang,
>
> Today's linux-next merge of the thermal tree got a conflict in
> drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal:
> solve compilation errors in rcar_thermal") from Linus' tree and commit
> ebbf0f11e7b4 ("Thermal: Pass zone parameters as argument to
> tzd_register") from the thermal tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
the fix looks good to me, Thanks!
-rui
next prev parent reply other threads:[~2012-11-05 1:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 0:46 linux-next: manual merge of the thermal tree with Linus' tree Stephen Rothwell
2012-11-05 1:17 ` Zhang Rui [this message]
2012-11-05 6:47 ` Zhang Rui
2019-09-20 12:46 Mark Brown
2021-09-26 23:50 Stephen Rothwell
2022-08-14 23:20 Stephen Rothwell
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=1352078275.2492.0.camel@rzhang1-mobl4 \
--to=rui.zhang@intel.com \
--cc=develkernel412222@gmail.com \
--cc=durgadoss.r@intel.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).