| 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
| ||
|
Date: Fri, 9 Dec 2011 11:47:56 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Erik Gilling <konkers@...roid.com>,
Colin Cross <ccross@...roid.com>,
Olof Johansson <olof@...om.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Marc Zyngier <marc.zyngier@....com>,
Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the tegra tree with the arm tree
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/board-dt.c between commit afed2a261825 ("ARM: tegra2:
convert to CONFIG_MULTI_IRQ_HANDLER") from the arm tree and commit
0d4f74792e29 ("arm/tegra: convert tegra20 to GIC devicetree binding")
from the tegra tree.
I did the obvious fixup (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/arm/mach-tegra/board-dt.c
index e417a83,2fa599d..0000000
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@@ -130,10 -150,8 +151,10 @@@ static const char * tegra_dt_board_comp
DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
.map_io = tegra_map_common_io,
.init_early = tegra_init_early,
- .init_irq = tegra_init_irq,
+ .init_irq = tegra_dt_init_irq,
+ .handle_irq = gic_handle_irq,
.timer = &tegra_timer,
.init_machine = tegra_dt_init,
+ .restart = tegra_assert_system_reset,
.dt_compat = tegra_dt_board_compat,
MACHINE_END
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists