linux-kernel - linux-next: manual merge of the tip 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]

Date:	Fri, 28 Mar 2014 14:50:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	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,
	Soren Brinkmann <soren.brinkmann@...inx.com>,
	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Michal Simek <michal.simek@...inx.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-zynq/common.c between commit 016f4dcae81e ("ARM: zynq:
Split slcr in two parts") from the arm-soc tree and commit cd325295871f
("arm: zynq: Add support for cpufreq") from the tip 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-zynq/common.c
index dca60d5ba756,a39be8e80856..000000000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -73,8 -74,7 +75,9 @@@ static void __init zynq_init_machine(vo
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  
  	platform_device_register(&zynq_cpuidle_device);
+ 	platform_device_register_full(&devinfo);
 +
 +	zynq_slcr_init();
  }
  
  static void __init zynq_timer_init(void)

Content of type "application/pgp-signature" skipped