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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
