Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1192582 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  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

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

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/

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web