From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755420AbbGZXcQ (ORCPT ); Sun, 26 Jul 2015 19:32:16 -0400 Received: from ozlabs.org ([103.22.144.67]:36785 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755092AbbGZXcO (ORCPT ); Sun, 26 Jul 2015 19:32:14 -0400 Date: Mon, 27 Jul 2015 09:32:12 +1000 From: Stephen Rothwell To: Simon Horman , Olof Johansson , Arnd Bergmann , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Magnus Damm , Nicolas Pitre Subject: linux-next: manual merge of the renesas tree with the arm-soc tree Message-ID: <20150727093212.6556dbcb@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 Simon, Today's linux-next merge of the renesas tree got conflicts in: arch/arm/mach-shmobile/board-marzen-reference.c and arch/arm/mach-shmobile/board-marzen.c between commit: 3017a8804ada ("ARM: appropriate __init annotation for const data") from the arm-soc tree and commits: d2fb6bdaffc7 ("ARM: shmobile: marzen-reference: Remove C board code") 9d35777f2b96 ("ARM: shmobile: marzen: Remove legacy board code") from the renesas tree. I fixed it up (I just removed the 2 files) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au