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 S1753122AbbKWBps (ORCPT <rfc822;w@1wt.eu>);
	Sun, 22 Nov 2015 20:45:48 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:45260 "EHLO
	mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753060AbbKWBpr (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 22 Nov 2015 20:45:47 -0500
X-AuditID: cbfec7f5-f79b16d000005389-14-56526fc8836f
Subject: Re: linux-next: manual merge of the clockevents tree with the
 samsung-krzk tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Lezcano <daniel.lezcano@linaro.org>
References: <20151123122247.23eb6f3d@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alim Akhtar <alim.akhtar@samsung.com>
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Message-id: <56526FC3.3040009@samsung.com>
Date: Mon, 23 Nov 2015 10:45:39 +0900
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-version: 1.0
In-reply-to: <20151123122247.23eb6f3d@canb.auug.org.au>
Content-type: text/plain; charset=windows-1252
Content-transfer-encoding: 7bit
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLLMWRmVeSWpSXmKPExsVy+t/xK7on8oPCDLZPF7V4MG8bm8W8z7IW
	r18YWlzeNYfN4uDCNkaLrXuvsjuweTTeuMHmcefaHjaPvi2rGD0+b5ILYInisklJzcksSy3S
	t0vgynj49hFjwT3Wihs/57E2MO5h6WLk5JAQMJF4/+oDG4QtJnHh3nogm4tDSGApo8Sedf9Y
	QRJCAl8YJXbtVwOxhQWiJNY8aANrEBGIlDj8YDYzRI2ZxO/VXWA2s0CqRGN7ExOIzSZgLLF5
	+RKwel4BLYnbO3+C2SwCqhIrJ/aAzRcViJCYOKGBFaJGUOLH5Htgx3EKmEu0rDjF3sXIATRT
	T+L+RS2I8fISm9e8ZZ7AKDALSccshKpZSKoWMDKvYhRNLU0uKE5KzzXSK07MLS7NS9dLzs/d
	xAgJ5K87GJceszrEKMDBqMTDq6EfFCbEmlhWXJl7iFGCg1lJhPd5BlCINyWxsiq1KD++qDQn
	tfgQozQHi5I478xd70OEBNITS1KzU1MLUotgskwcnFINjPWxj+cZmnPeuH06ouzomrNm0rzV
	E86/W7WM52fxlK9OrhVWkVccnzzd6ljeJTm9YNeK05vfzMpt3SczVf8tS/g043ozX9Uji75e
	T9CKXf648kSZ54dZytdbWb5dvep4NWRTdWjz33da2+/6fZJIjpu7pWPhZY4VlY6TtFc/2nTq
	h8SdPdaKzK5KLMUZiYZazEXFiQCAszRvYAIAAA==
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 23.11.2015 10:22, Stephen Rothwell wrote:
> Hi Daniel,
> 
> Today's linux-next merge of the clockevents tree got a conflict in:
> 
>   arch/arm/mach-exynos/Kconfig
> 
> between commit:
> 
>   23067d397616 ("ARM: EXYNOS: Switch to syscon reboot and poweroff")
> 
> from the samsung-krzk tree and commit:
> 
>   b21f38ccbc1d ("clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option")
> 
> from the clockevents tree.
> 
> OK, so these entries were sorted at one point for a reason :-(
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks, merge fix looks good. Indeed we should have put them in
alphabetical order.

Best regards,
Krzysztof