linux-kernel - linux-next: manual merge of the tegra 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20130123162537.b4285c002892dde1405559a6@canb.auug.org.au>
Date:	Wed, 23 Jan 2013 16:25:37 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Herring <rob.herring@...xeda.com>,
	Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>,
	Prashant Gaikwad <pgaikwad@...dia.com>
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit 0529e315bbda ("ARM: use
common irqchip_init for GIC init") from the arm-soc tree and commit
567f70da22d2 ("ARM: tegra: migrate to new clock code") from the tegra
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-tegra/common.c
index 3599959,87dd69c..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -21,9 -21,11 +21,10 @@@
  #include <linux/io.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
 -#include <linux/of_irq.h>
 +#include <linux/irqchip.h>
+ #include <linux/clk/tegra.h>
  
  #include <asm/hardware/cache-l2x0.h>
 -#include <asm/hardware/gic.h>
  
  #include <mach/powergate.h>
  
@@@ -56,10 -58,16 +57,11 @@@ u32 tegra_uart_config[4] = 
  };
  
  #ifdef CONFIG_OF
 -static const struct of_device_id tegra_dt_irq_match[] __initconst = {
 -	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
 -	{ }
 -};
 -
  void __init tegra_dt_init_irq(void)
  {
+ 	tegra_clocks_init();
  	tegra_init_irq();
 -	of_irq_init(tegra_dt_irq_match);
 +	irqchip_init();
  }
  #endif
  

Content of type "application/pgp-signature" skipped