Merge branch 'akpm-current/current'

Conflicts:
	arch/Kconfig
	arch/x86/mm/numa.c
	block/blk-mq-cpu.c
	mm/memcontrol.c
	mm/mlock.c

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/filesystems/proc.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/dma.h
index 58b8c6a0ab1fe3985772746932a1713e29bd1ea0,58b8c6a0ab1fe3985772746932a1713e29bd1ea0..99084431d6ae2616498bef8b3edee9351d75cbe7
--- 1/arch/arm/include/asm/dma.h
--- 2/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@@ -8,8 -8,8 +8,8 @@@
  #define MAX_DMA_ADDRESS       0xffffffffUL
  #else
  #define MAX_DMA_ADDRESS       ({ \
--      extern unsigned long arm_dma_zone_size; \
--      arm_dma_zone_size ? \
++      extern phys_addr_t arm_dma_zone_size; \
++      arm_dma_zone_size && arm_dma_zone_size < (0x10000000 - PAGE_OFFSET) ? \
                (PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; })
  #endif
  

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/numa.c
index c85da7bb6b603cf2cab624835ea2d6459958ce5b,f26b16f0d3e0c2fa0387228d55d39cd07d64e492..bb1a3828f935f909bf463dd6dddae094c3d27128
--- 1/arch/x86/mm/numa.c
--- 2/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@@ -211,11 -211,12 +211,12 @@@ static void __init setup_node_data(int 
         */
        nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
        if (!nd_pa) {
 -              nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES,
 -                                         MAX_NUMNODES);
+               pr_warn("Cannot find %zu bytes in node %d, so try other nodes",
+                       nd_size, nid);
 +              nd_pa = __memblock_alloc_base(nd_size, SMP_CACHE_BYTES,
 +                                            MEMBLOCK_ALLOC_ACCESSIBLE);
                if (!nd_pa) {
-                       pr_err("Cannot find %zu bytes in node %d\n",
-                              nd_size, nid);
+                       pr_err("Cannot find %zu bytes in any node\n", nd_size);
                        return;
                }
        }

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/firmware/Kconfig
index a6ef6acaa1c80b0e781b7f8b71310e7093e71648,5a29fac951ec045fa45d9dfda6aec6b6d4557d88..41983883cef47da740612a9966d39ec97094d593
--- 1/drivers/firmware/Kconfig
--- 2/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@@ -108,9 -108,12 +108,12 @@@ config DMI_SYSF
          under /sys/firmware/dmi when this option is enabled and
          loaded.
  
+ config DMI_SCAN_MACHINE_NON_EFI_FALLBACK
+       bool
+ 
  config ISCSI_IBFT_FIND
        bool "iSCSI Boot Firmware Table Attributes"
 -      depends on X86
 +      depends on X86 && ACPI
        default n
        help
          This option enables the kernel to find the region of memory

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_acpi.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/misc/ti-st/st_core.c
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/rtc/Makefile
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/printk.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc lib/swiotlb.c
Simple merge

diff --cc mm/hugetlb_cgroup.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/page_io.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge