linux-next: manual merge of the arm-soc tree with the arm tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-u300/Makefile.boot between commit 74b84ad6c1a5 ("ARM:
7022/1: allow to detect conflicting zreladdrs") from the arm tree and
commit 732851465445 ("mach-u300: retire odd singlemem variant") from the
arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-u300/Makefile.boot
index 69357af,a06bb0d..0000000
--- a/arch/arm/mach-u300/Makefile.boot
+++ b/arch/arm/mach-u300/Makefile.boot
@@@ -1,15 -1,4 +1,4 @@@
- # Note: the following conditions must always be true:
- #   ZRELADDR == virt_to_phys(TEXTADDR)
- #   PARAMS_PHYS must be within 4MB of ZRELADDR
- #   INITRD_PHYS must be in RAM
- 
- ifdef CONFIG_MACH_U300_SINGLE_RAM
-      zreladdr-y	+= 0x28E08000
-   params_phys-y	:= 0x28E00100
- else
-      zreladdr-y	+= 0x48008000
-   params_phys-y	:= 0x48000100
- endif
- 
 -   zreladdr-y	:= 0x48008000
++   zreladdr-y	+= 0x48008000
+ params_phys-y	:= 0x48000100
  # This isn't used.
- #initrd_phys-y	:= 0x29800000
+ #initrd_phys-y	:= 0x48800000
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/