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 S1752088AbcCAXUk (ORCPT <rfc822;w@1wt.eu>);
	Tue, 1 Mar 2016 18:20:40 -0500
Received: from mailout4.w1.samsung.com ([210.118.77.14]:36602 "EHLO
	mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751785AbcCAXUi (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 1 Mar 2016 18:20:38 -0500
X-AuditID: cbfec7f4-f79026d00000418a-88-56d623c23e39
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc
 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>, Olof Johansson <olof@lixom.net>,
        Arnd Bergmann <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org
References: <20160302091450.6b1463bf@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alim Akhtar <alim.akhtar@samsung.com>,
        Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Message-id: <56D623BE.3050303@samsung.com>
Date: Wed, 02 Mar 2016 08:20:30 +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: <20160302091450.6b1463bf@canb.auug.org.au>
Content-type: text/plain; charset=windows-1252
Content-transfer-encoding: 7bit
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsVy+t/xa7qHlK+FGUz9Z2DxYN42Nou/k46x
	W7x+YWix6fE1VovLu+awWRxc2MZocer6ZzaLrXuvslu0HTvG6sDp8fvXJEaPxhs32DzuXNvD
	5rF5Sb3HlRNNrB59W1YxenzeJBfAHsVlk5Kak1mWWqRvl8CV8XXOfJaC7awVl6cuZ2lgXMTS
	xcjJISFgIjGp5wkzhC0mceHeejYQW0hgKaPEsreWEPZTRoldh51BbGGBMInlB/+ydjFycYgI
	TGaUWDzjLQtEkZnE/S3f2EESzAJzGSWO7zoINolNwFhi8/IlYDavgJbEu5Y2JhCbRUBVYnnj
	G7DNogIREoc7u9ghagQlfky+BzaUU8Bc4tr3z4xdjBxAQ/Uk7l/UAgkzC8hLbF7zlnkCo8As
	JB2zEKpmIalawMi8ilE0tTS5oDgpPddQrzgxt7g0L10vOT93EyMkDr7sYFx8zOoQowAHoxIP
	b8anq2FCrIllxZW5hxglOJiVRHjPKV4LE+JNSaysSi3Kjy8qzUktPsQozcGiJM47d9f7ECGB
	9MSS1OzU1ILUIpgsEwenVANja1JfzbOp/81UjhgqHfwqEd/yUqbBJKh7fsi/NU7/jFa47jCw
	vzNzavOJnDkKZx0ORDT+3lDmcXHXg2kz5O69e7/TvmUrt+fKg6YGFYH5pqxMwafc/vrws+z6
	ZdpXvGLT6+KKPfO+dx04ZdowO/laaUO+y2fmsunXcs76vVH/v979R9ePWzGiSizFGYmGWsxF
	xYkAz2zNXX8CAAA=
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 02.03.2016 07:14, Stephen Rothwell wrote:
> Hi Krzysztof,
> 
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
> 
>   arch/arm64/configs/defconfig
> 
> between commit:
> 
>   efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
> 
> from the arm-soc tree and commit:
> 
>   617fe7196d54 ("arm64: defconfig: Enable exynos thermal config")
>   6bb837189388 ("arm64: defconfig: Enable Samsung MFD and related configs")
> 
> from the samsung-krzk tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action

Yeah, that was expected... Thanks for the fix, looks fine from Samsung's
side.

Best regards,
Krzysztof