From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kukjin Kim Subject: Re: [PATCH v4 00/17] thermal: exynos: Thermal code rework to use device tree Date: Sat, 24 Jan 2015 13:04:40 +0900 Message-ID: <54C319D8.4050303@kernel.org> References: <1412872737-624-1-git-send-email-l.majewski@samsung.com> <1421407861-25099-1-git-send-email-l.majewski@samsung.com> <0dad01d036e0$2f376c80$8da64580$@kernel.org> <20150123105944.457d6d07@amdc2363> <0e1401d036fb$c00a3510$401e9f30$@kernel.org> <20150123144540.GF13468@developer.hsd1.ca.comcast.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150123144540.GF13468@developer.hsd1.ca.comcast.net> Sender: linux-samsung-soc-owner@vger.kernel.org To: Eduardo Valentin Cc: Kukjin Kim , 'Lukasz Majewski' , 'Zhang Rui' , 'Linux PM list' , linux-samsung-soc@vger.kernel.org, 'Bartlomiej Zolnierkiewicz' , 'Lukasz Majewski' , 'Amit Daniel Kachhap' , 'Abhilash Kesavan' , 'Kyungmin Park' , 'Chanwoo Choi' , 'Abhilash Kesavan' List-Id: linux-pm@vger.kernel.org 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 > 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