Message-ID: <54E5CD2E.9070608@collabora.co.uk>
Date: Thu, 19 Feb 2015 12:46:54 +0100
From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.2.0
MIME-Version: 1.0
To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>,
        linux-samsung-soc@vger.kernel.org
CC: 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>, Kukjin Kim <kgene@kernel.org>,
        open list <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>
In-Reply-To: <1424275812-6797-1-git-send-email-afaerber@suse.de>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1024
Lines: 26

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>

Best regards,
Javier
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/