Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1208313
| From | Viresh Kumar <viresh.kumar@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the thermal-soc tree with the arm tree |
| Date | 2015-08-17 04:30 +0200 |
| Message-ID | <pYilr-24F-3@gated-at.bofh.it> (permalink) |
| References | <pYibL-1Tp-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-17 04:20 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Viresh Kumar <viresh.kumar@linaro.org> - 2015-08-17 04:30 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-17 10:00 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-17 10:10 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Eduardo Valentin <edubezval@gmail.com> - 2015-08-18 04:40 +0200
csiph-web