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 S932914AbbCQQ2H (ORCPT <rfc822;w@1wt.eu>);
	Tue, 17 Mar 2015 12:28:07 -0400
Received: from mail.kernel.org ([198.145.29.136]:37049 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754324AbbCQQ2B (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 17 Mar 2015 12:28:01 -0400
Message-ID: <55085605.2000001@kernel.org>
Date: Wed, 18 Mar 2015 01:27:49 +0900
From: Kukjin Kim <kgene@kernel.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Lightning/1.0b3pre Thunderbird/3.1.16
MIME-Version: 1.0
To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
CC: linux-samsung-soc@vger.kernel.org, Kukjin Kim <kgene@kernel.org>,
        Javier Martinez Canillas <javier.martinez@collabora.co.uk>,
        linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
        Vincent Palatin <vpalatin@chromium.org>,
        Doug Anderson <dianders@chromium.org>,
        Tomasz Figa <t.figa@samsung.com>,
        Jaehoon Chung <jh80.chung@samsung.com>,
        Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Ian Campbell <ijc+devicetree@hellion.org.uk>,
        Kumar Gala <galak@codeaurora.org>,
        Russell King <linux@arm.linux.org.uk>,
        LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes
References: <1424275812-6797-1-git-send-email-afaerber@suse.de> <54E5CD2E.9070608@collabora.co.uk> <5506EEF9.7080100@suse.de>
In-Reply-To: <5506EEF9.7080100@suse.de>
X-Enigmail-Version: 1.1.1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 03/16/15 23:55, Andreas Färber wrote:
> Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas:
>> Hello Andreas,
>>
Hi,

>> On 02/18/2015 05:10 PM, Andreas Färber wrote:
>>> Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts:
>>> unuse the slot-node and deprecate the supports-highspeed for dw-mmc in
>>> exynos") by dropping the slot@0 nodes, moving its bus-width property to
>>> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed,
>>> matching exynos5250-snow.
>>>
>>> Cc: Jaehoon Chung <jh80.chung@samsung.com>
>>> Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree")
>>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>>> ---
>>>  arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------
>>>  1 file changed, 4 insertions(+), 12 deletions(-)
>>>
>>
>> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> 
> Ping!
> 
Thanks, applied with 'Cc: <stable@vger.kernel.org> [3.19+]'

- Kukjin