From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346AbbG3WiJ (ORCPT ); Thu, 30 Jul 2015 18:38:09 -0400 Received: from ozlabs.org ([103.22.144.67]:34251 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbbG3WiG (ORCPT ); Thu, 30 Jul 2015 18:38:06 -0400 Date: Fri, 31 Jul 2015 08:38:03 +1000 From: Stephen Rothwell To: Nicolas Ferre , Olof Johansson , Arnd Bergmann , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Pitre Subject: linux-next: manual merge of the at91 tree with the arm-soc tree Message-ID: <20150731083803.71c9d466@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Nicolas, Today's linux-next merge of the at91 tree got a conflict in: arch/arm/mach-at91/sama5.c between commit: 19c233b79d1a ("ARM: appropriate __init annotation for const data") from the arm-soc tree and commit: a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC") from the at91 tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/mach-at91/sama5.c index 8fc47630bbc8,90c3c3051ae7..000000000000 --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@@ -63,7 -65,8 +65,8 @@@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5 .dt_compat = sama5_dt_board_compat, MACHINE_END -static const char *sama5_alt_dt_board_compat[] __initconst = { +static const char *const sama5_alt_dt_board_compat[] __initconst = { + "atmel,sama5d2", "atmel,sama5d4", NULL };