From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754190AbcCBXlC (ORCPT <rfc822;w@1wt.eu>);
	Wed, 2 Mar 2016 18:41:02 -0500
Received: from mailout3.w1.samsung.com ([210.118.77.13]:46322 "EHLO
	mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752950AbcCBXlA (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 2 Mar 2016 18:41:00 -0500
X-AuditID: cbfec7f5-f79b16d000005389-76-56d77a08de3b
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the omap
 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>, Tony Lindgren <tony@atomide.com>
References: <20160303091631.1ef24e87@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Michael Turquette <mturquette@baylibre.com>,
        James Liao <jamesjj.liao@mediatek.com>,
        Stephen Boyd <sboyd@codeaurora.org>
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Message-id: <56D77A04.1090802@samsung.com>
Date: Thu, 03 Mar 2016 08:40:52 +0900
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.5.1
MIME-version: 1.0
In-reply-to: <20160303091631.1ef24e87@canb.auug.org.au>
Content-type: text/plain; charset=windows-1252
Content-transfer-encoding: 7bit
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsVy+t/xq7ocVdfDDH53SFqsvjyD0eL1C0OL
	y7vmsFkcXNjGaHHxlKvFjzPdLBZb915lt9h/xcuBw+Pb10ksHu9vtLJ7NN64weZxua+XyaPl
	5H4Wj74tqxg9Pm+SC2CP4rJJSc3JLEst0rdL4Mo4+7WNraCNtWLqm2/MDYzvmbsYOTkkBEwk
	TlyZA2WLSVy4t56ti5GLQ0hgKaPEnQfzoZynjBIXNvSzgFQJCwRLbN/ZDWaLCPhKdH+aCGYL
	CZhJbJx4A8xmFtjFKDF9kQWIzSZgLLF5+RI2EJtXQEvi6dlLTCA2i4CqxPpvN8HqRQUiJA53
	drFD1AhK/Jh8DyzOKWAusWfnZKBeDqCZehL3L2pBjJeX2LzmLfMERoFZSDpmIVTNQlK1gJF5
	FaNoamlyQXFSeq6RXnFibnFpXrpecn7uJkZI6H/dwbj0mNUhRgEORiUe3oxPV8OEWBPLiitz
	DzFKcDArifD+j74eJsSbklhZlVqUH19UmpNafIhRmoNFSZx35q73IUIC6YklqdmpqQWpRTBZ
	Jg5OqQZGpzcvFhvJxDv+XSRi8qkv8LnI7+yO80GX31xZ/HbbNEX+drnnX/+dKjuy2vLEN+nX
	lYmKnS7pM1h/nPi7dsmcWT/SHOu3yH2Ylp0wgdOw/OT+08HGvtMVq7457zow1Sr1oZJ4Y7fl
	5AD3FoNvP5K/7WZPuuyqsiai44643f+n384ldKz99lrbWYmlOCPRUIu5qDgRAF/Dnvx5AgAA
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 03.03.2016 07:16, Stephen Rothwell wrote:
> Hi Krzysztof,
> 
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
> 
>   drivers/clk/Kconfig
> 
> between commit:
> 
>   21330497f303 ("clk: ti: Add support for dm814x ADPLL")
> 
> from the omap tree and commit:
> 
>   b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
> 
> from the samsung-krzk tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Thanks!

The conflicting commit actually comes from clk tree, merged here as a
dependency for other patches.

Best regards,
Krzysztof