linux-kernel - linux-next: manual merge of the arm-current tree with Linus' 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: <20120124115909.0c2119249212ac9669860afc@canb.auug.org.au>
Date:	Tue, 24 Jan 2012 11:59:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the arm-current tree with Linus' tree

Hi Russell,

Today's linux-next merge of the arm-current tree got a conflict in
arch/arm/mach-mx5/Kconfig between commit 784a90c0a7d8 ("ARM i.MX: Merge
i.MX5 support into mach-imx") from Linus' tree and commit a092f2b15399
("ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs") from
the arm-current tree.

The former removed the file and merged its contents into
arch/arm/mach-imx/Kconfig, so I removed it and applied the following
fixup patch - which I can carry as necessary.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 24 Jan 2012 11:56:27 +1100
Subject: [PATCH] ARM: fix up for cache size assumed to be 64 bytes

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 arch/arm/mach-imx/Kconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 09f357b..4defb97 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -87,7 +87,6 @@ config SOC_IMX35
 
 config SOC_IMX5
 	select CPU_V7
-	select ARM_L1_CACHE_SHIFT_6
 	select MXC_TZIC
 	select ARCH_MXC_IOMUX_V3
 	select ARCH_MXC_AUDMUX_V2
-- 
1.7.9.rc0.23.g7e521

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped