Message-ID: <555C3BB4.2000802@atmel.com>
Date: Wed, 20 May 2015 09:45:56 +0200
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Organization: atmel
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Kukjin Kim <kgene.kim@samsung.com>, Olof Johansson <olof@lixom.net>,
        Arnd Bergmann <arnd@arndb.de>, <linux-arm-kernel@lists.infradead.org>
CC: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        "Alexandre Belloni" <alexandre.belloni@free-electrons.com>,
        Ard Biesheuvel <ard.biesheuvel@linaro.org>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Lee Jones <lee.jones@linaro.org>,
        Maxime Coquelin <maxime.coquelin@st.com>,
        "Baruch Siach" <baruch@tkos.co.il>,
        Krzysztof Kozlowski <k.kozlowski.k@gmail.com>,
        Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc
 and at91 trees
References: <20150520102743.3d336a73@canb.auug.org.au>
In-Reply-To: <20150520102743.3d336a73@canb.auug.org.au>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 655
Lines: 18

Le 20/05/2015 02:27, Stephen Rothwell a ?crit :
> Hi Kukjin,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between various commits from the
> arm-soc and at91 trees and various commits from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

AT91 part seems okay. Thanks,
-- 
Nicolas Ferre
--
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/