linux-kernel - linux-next: manual merge of the tegra tree with the arm 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:	Mon, 19 Dec 2011 11:14:51 +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,
	Russell King <rmk@....linux.org.uk>,
	Peter De Schrijver <pdeschrijver@...dia.com>
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-tegra20.c (called
arch/arm/mach-tegra/board-dt.c in the arm tree) between commit
b8a0b3079c03 ("ARM: restart: tegra: use new restart hook") from the arm
tree and commit c37c07ddf269 ("arm/tegra: prepare early init for multiple
tegra variants") from the tegra tree.

Just context change. I fixed it up (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-tegra20.c
index e417a83,ddaa037..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -134,6 -144,5 +144,6 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
  	.handle_irq	= gic_handle_irq,
  	.timer		= &tegra_timer,
  	.init_machine	= tegra_dt_init,
 +	.restart	= tegra_assert_system_reset,
- 	.dt_compat	= tegra_dt_board_compat,
+ 	.dt_compat	= tegra20_dt_board_compat,
  MACHINE_END

Content of type "application/pgp-signature" skipped