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]

Message-Id: <20120227104009.37c86507539fc4f5d1239807@canb.auug.org.au>
Date:	Mon, 27 Feb 2012 10:40:09 +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,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Peter De Schrijver <pdeschrijver@...dia.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/common.c between commit daa14d5e60e0 ("ARM:
mach-tegra: properly disable CPU idle call") from the arm tree and commit
65fe31da5ced ("ARM: tegra: support for Tegra30 CPU powerdomains") from
the tegra tree.

Just context changes.  I fixed it up (see below) and can carry the fax as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-tegra/common.c
index 2db20da,09dc37fc..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -27,6 -27,8 +27,7 @@@
  #include <asm/hardware/gic.h>
  
  #include <mach/iomap.h>
 -#include <mach/system.h>
+ #include <mach/powergate.h>
  
  #include "board.h"
  #include "clock.h"

Content of type "application/pgp-signature" skipped