linux-kernel - linux-next: manual merge of the msm 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, 31 Jan 2011 13:14:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Brown <davidb@...eaurora.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>,
	Stepan Moskovchenko <stepanm@...eaurora.org>
Subject: linux-next: manual merge of the msm tree with the arm tree

Hi David,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/include/mach/memory.h between commit
66a37c58abc2d7e953e339c64721dc53fb140b38 ("ARM: P2V: separate PHYS_OFFSET
from platform definitions") from the arm tree and commit
a2ad9421ce19f57e99b7a5e8798b8697b916d673 ("msm: Physical offset for
MSM8960") from the msm tree.

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-msm/include/mach/memory.h
index 176875d,014bbd3..0000000
--- a/arch/arm/mach-msm/include/mach/memory.h
+++ b/arch/arm/mach-msm/include/mach/memory.h
@@@ -18,15 -18,17 +18,17 @@@
  
  /* physical offset of RAM */
  #if defined(CONFIG_ARCH_QSD8X50) && defined(CONFIG_MSM_SOC_REV_A)
 -#define PHYS_OFFSET		UL(0x00000000)
 +#define PLAT_PHYS_OFFSET		UL(0x00000000)
  #elif defined(CONFIG_ARCH_QSD8X50)
 -#define PHYS_OFFSET		UL(0x20000000)
 +#define PLAT_PHYS_OFFSET		UL(0x20000000)
  #elif defined(CONFIG_ARCH_MSM7X30)
 -#define PHYS_OFFSET		UL(0x00200000)
 +#define PLAT_PHYS_OFFSET		UL(0x00200000)
  #elif defined(CONFIG_ARCH_MSM8X60)
 -#define PHYS_OFFSET		UL(0x40200000)
 +#define PLAT_PHYS_OFFSET		UL(0x40200000)
+ #elif defined(CONFIG_ARCH_MSM8960)
 -#define PHYS_OFFSET		UL(0x40200000)
++#define PLAT_PHYS_OFFSET		UL(0x40200000)
  #else
 -#define PHYS_OFFSET		UL(0x10000000)
 +#define PLAT_PHYS_OFFSET		UL(0x10000000)
  #endif
  
  #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/