Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
	arch/arm64/Kconfig: keep ARCH_MMAP_RND_BITS_MIN etc config

diff --cc Makefile
Simple merge

diff --cc arch/arm64/Kconfig
index bf87f37e84b2244d6c9ca5b4de2932f00cc9b1cb,82bff5734ac09c2bab646672a9293d4b2d67c8db..5c74ad90a4477e50d4327397424280fae74ff931
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -114,33 -112,18 +114,45 @@@ config ARCH_PHYS_ADDR_T_64BI
  config MMU
        def_bool y
  
 +config ARCH_MMAP_RND_BITS_MIN
 +       default 14 if ARM64_64K_PAGES
 +       default 16 if ARM64_16K_PAGES
 +       default 18
 +
 +# max bits determined by the following formula:
 +#  VA_BITS - PAGE_SHIFT - 3
 +config ARCH_MMAP_RND_BITS_MAX
 +       default 19 if ARM64_VA_BITS=36
 +       default 24 if ARM64_VA_BITS=39
 +       default 27 if ARM64_VA_BITS=42
 +       default 30 if ARM64_VA_BITS=47
 +       default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES
 +       default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES
 +       default 33 if ARM64_VA_BITS=48
 +       default 14 if ARM64_64K_PAGES
 +       default 16 if ARM64_16K_PAGES
 +       default 18
 +
 +config ARCH_MMAP_RND_COMPAT_BITS_MIN
 +       default 7 if ARM64_64K_PAGES
 +       default 9 if ARM64_16K_PAGES
 +       default 11
 +
 +config ARCH_MMAP_RND_COMPAT_BITS_MAX
 +       default 16
 +
+ config ARM64_PAGE_SHIFT
+       int
+       default 16 if ARM64_64K_PAGES
+       default 14 if ARM64_16K_PAGES
+       default 12
+ 
+ config ARM64_CONT_SHIFT
+       int
+       default 5 if ARM64_64K_PAGES
+       default 7 if ARM64_16K_PAGES
+       default 4
+ 
  config NO_IOPORT_MAP
        def_bool y if !PCI
  

diff --cc drivers/staging/android/ashmem.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge