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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150727092719.22e43573@canb.auug.org.au>
Date:	Mon, 27 Jul 2015 09:27:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>, Olof Johansson <olof@...om.net>,
	Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Magnus Damm <damm+renesas@...nsource.se>
Subject: 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@...b.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/