Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752116AbbETHme (ORCPT ); Wed, 20 May 2015 03:42:34 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:43466 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751277AbbETHmb (ORCPT ); Wed, 20 May 2015 03:42:31 -0400 Message-ID: <555C3AAC.40101@atmel.com> Date: Wed, 20 May 2015 09:41:32 +0200 From: Nicolas Ferre 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 , Olof Johansson , Arnd Bergmann , CC: , , "Alexandre Belloni" , Ard Biesheuvel Subject: Re: linux-next: manual merge of the at91 tree with the arm-soc tree References: <20150520100851.2e485c02@canb.auug.org.au> In-Reply-To: <20150520100851.2e485c02@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 791 Lines: 22 Le 20/05/2015 02:08, Stephen Rothwell a ?crit : > Hi Nicolas, > > Today's linux-next merge of the at91 tree got a conflict in > arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM: > multi_v7_defconfig: enable asm and NEON accelerated crypto modules") > from the arm-soc tree and commit 822cfdfb9511 ("ARM: > multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Fix seems perfect: thanks Stephen. Bye, -- 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/