Groups > linux.kernel > #1192582

linux-next: manual merge of the renesas tree with the arm-soc tree

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the renesas tree with the arm-soc tree
Date	Mon, 27 Jul 2015 01:30:02 +0200
Message-ID	<pQDwK-NF-5@gated-at.bofh.it> (permalink)
X-Original-To	Simon Horman <horms@verge.net.au>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, <linux-arm-kernel@lists.infradead.org>
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	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	47
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Pitre <nicolas.pitre@linaro.org>, Magnus Damm <damm+renesas@opensource.se>
X-Original-Date	Mon, 27 Jul 2015 09:27:19 +1000
X-Original-Message-ID	<20150727092719.22e43573@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1192582

Show key headers only | View raw

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in:

  arch/arm/mach-shmobile/setup-r8a7779.c

between commit:

  3017a8804ada ("ARM: appropriate __init annotation for const data")

from the arm-soc tree and commit:

  131c2e0480b0 ("ARM: shmobile: r8a7779: Generic CCF and timer suppor")

from the renesas 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-shmobile/setup-r8a7779.c
index 2321c9de2274,c18d85a96c67..000000000000
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@@ -756,7 -96,13 +96,13 @@@ static u32 __init r8a7779_read_mode_pin
  	return mode;
  }
  
+ static void __init r8a7779_init_time(void)
+ {
+ 	r8a7779_clocks_init(r8a7779_read_mode_pins());
+ 	clocksource_of_init();
+ }
+ 
 -static const char *r8a7779_compat_dt[] __initdata = {
 +static const char *r8a7779_compat_dt[] __initconst = {
  	"renesas,r8a7779",
  	NULL,
  };
--
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/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the renesas tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-07-27 01:30 +0200

csiph-web