Re: [PATCH v4 00/17] thermal: exynos: Thermal code rework to use device tree

Kukjin Kim
2015-01-24T04:04:40Z

On 01/23/15 23:45, Eduardo Valentin wrote:
> Hi Kukjin,
>
Hi Eduardo,

[...]

>>>> I hope will apply DT changes in Samsung tree. Is it OK to thermal
>>>> tree?
>>>
>>> I think that it is up to you and Eduardo to decide :-).
>>>
>>> I'd personally prefer to add this patch set at once to Eduardo's tree
>>> (of course with your ACKs).
>>>
>> If so, we could see too many useless merge conflicts. Because your patches
>> touch most of exynos DT stuff and that's why DT changes should be handled in
>> Samsung tree if there is no problem ;) Let's wait for thermal guys.
>
> Let's target the latest version (v6) of this series. You can add my
> Acked-by: Eduardo Valentin <edubezval@gmail.com>
>
OK, I'll take DT changes in my tree with your ack.

> in the DTS changes. And add them via your tree. I believe we will avoid
> merge conflicts this way. I will handle the patches touching drivers/.
>
Sure, thanks.

- Kukjin