Merge remote-tracking branch 'robh/for-next' into devicetree/next

diff --combined Makefile
index 48a4a5b3f7411204f1c98682f91cbf51afde1a3c,1a2628ee5d917376f0f9262eb8c0ba4722a89775..c2bb9d3c3a7854f57420994af0a0d6f12ac12e78
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 14
  SUBLEVEL = 0
- EXTRAVERSION = -rc5
+ EXTRAVERSION = -rc6
  NAME = Shuffling Zombie Juror
  
  # *DOCUMENTATION*
@@@ -728,13 -728,6 +728,13 @@@ export KBUILD_IMAGE ?= vmlinu
  # images. Default is /boot, but you can set it to other values
  export        INSTALL_PATH ?= /boot
  
 +#
 +# INSTALL_DTBS_PATH specifies a prefix for relocations required by build roots.
 +# Like INSTALL_MOD_PATH, it isn't defined in the Makefile, but can be passed as
 +# an argument if needed. Otherwise it defaults to the kernel install path
 +#
 +export INSTALL_DTBS_PATH ?= $(INSTALL_PATH)/dtbs/$(KERNELRELEASE)
 +
  #
  # INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory
  # relocations required by build roots.  This is not defined in the

diff --combined arch/arm/Kconfig
index d0262bea8020c2f4d1f99fc700fae659c76314ec,15949459611f194376dafcdebaf569f8ef141dc5..8b562c82d8a2decc2b88c4984349fc56ceded2f8
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1578,6 -1578,7 +1578,7 @@@ config BL_SWITCHER_DUMMY_I
  
  choice
        prompt "Memory split"
+       depends on MMU
        default VMSPLIT_3G
        help
          Select the desired split between kernel and user memory.
@@@ -1595,6 -1596,7 +1596,7 @@@ endchoic
  
  config PAGE_OFFSET
        hex
+       default PHYS_OFFSET if !MMU
        default 0x40000000 if VMSPLIT_1G
        default 0x80000000 if VMSPLIT_2G
        default 0xC0000000
@@@ -1903,6 -1905,7 +1905,7 @@@ config XE
        depends on ARM && AEABI && OF
        depends on CPU_V7 && !CPU_V6
        depends on !GENERIC_ATOMIC64
+       depends on MMU
        select ARM_PSCI
        select SWIOTLB_XEN
        select ARCH_DMA_ADDR_T_64BIT
@@@ -1918,7 -1921,6 +1921,7 @@@ config USE_O
        select IRQ_DOMAIN
        select OF
        select OF_EARLY_FLATTREE
 +      select OF_RESERVED_MEM
        help
          Include support for flattened device tree machine descriptions.