From: Viresh Kumar <viresh.kumar@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eduardo Valentin <edubezval@gmail.com>,
Russell King <linux@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the thermal-soc tree with the arm tree
Date: Mon, 17 Aug 2015 07:54:07 +0530 [thread overview]
Message-ID: <20150817022407.GN1162@linux> (raw)
In-Reply-To: <20150817121754.04736e67@canb.auug.org.au>
On 17-08-15, 12:17, Stephen Rothwell wrote:
> Hi Eduardo,
>
> Today's linux-next merge of the thermal-soc tree got a conflict in:
>
> drivers/thermal/cpu_cooling.c
>
> between commit:
>
> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>
> from the arm tree and commits:
>
> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>
> from the thermal-soc tree.
>
> I fixed it up (the first two look like two versions of the same patch,
> so I used the version from the thermal-soc tree) and can carry the fix
> as necessary (no action is required).
Right the version from the thermal tree is the updated version and
should be picked.
> Russell: that commit in your tree has no Signed-off-by :-(
No. It does have a SOB, but that followed a bit of rant/history on why
Russell carried this patch :)
Russell should be dropping that patch soon, AFAIU.
--
viresh
next prev parent reply other threads:[~2015-08-17 2:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 2:17 linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell
2015-08-17 2:24 ` Viresh Kumar [this message]
2015-08-17 7:55 ` Russell King - ARM Linux
2015-08-17 8:03 ` Stephen Rothwell
2015-08-18 9:33 ` Eduardo Valentin
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=20150817022407.GN1162@linux \
--to=viresh.kumar@linaro.org \
--cc=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--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.