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 S933921AbbCPO4C (ORCPT <rfc822;w@1wt.eu>);
	Mon, 16 Mar 2015 10:56:02 -0400
Received: from cantor2.suse.de ([195.135.220.15]:44910 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S933906AbbCPOz5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 16 Mar 2015 10:55:57 -0400
Message-ID: <5506EEF9.7080100@suse.de>
Date: Mon, 16 Mar 2015 15:55:53 +0100
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
Organization: SUSE Linux GmbH
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
MIME-Version: 1.0
To: linux-samsung-soc@vger.kernel.org, Kukjin Kim <kgene@kernel.org>
CC: 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>
In-Reply-To: <54E5CD2E.9070608@collabora.co.uk>
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

Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas:
> Hello Andreas,
> 
> 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!

> 
> Best regards,
> Javier

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)