Merge branch 'akpm-current/current'

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 Documentation/sysctl/kernel.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

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

diff --cc arch/arm/mm/init.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/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
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
Simple merge

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/cirrus/cirrus_mode.c
Simple merge

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/iommu/intel-iommu.c
Simple merge

diff --cc drivers/mfd/max8998.c
Simple merge

diff --cc drivers/mfd/tps65217.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 drivers/rtc/rtc-cmos.c
Simple merge

diff --cc drivers/tty/Kconfig
Simple merge

diff --cc include/linux/init_task.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 include/linux/sched/sysctl.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 kernel/time/sched_clock.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/huge_memory.c
Simple merge

diff --cc mm/hugetlb_cgroup.c
Simple merge

diff --cc mm/memcontrol.c
index 7caff36180cda1c3e012f6ff17765f3e26c5a07f,2dae1f8d67ad588167173d6ba03b05790546e0f2..a815686b7f0acf6a27efd1bc26c8d399adf363f5
--- 1/mm/memcontrol.c
--- 2/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -5183,14 -5081,27 +5119,26 @@@ static u64 mem_cgroup_read_u64(struct c
                BUG();
        }
  
 -      len = scnprintf(str, sizeof(str), "%llu\n", (unsigned long long)val);
 -      return simple_read_from_buffer(buf, nbytes, ppos, str, len);
 +      return val;
  }
  
- static int memcg_update_kmem_limit(struct cgroup_subsys_state *css, u64 val)
- {
-       int ret = -EINVAL;
  #ifdef CONFIG_MEMCG_KMEM
-       struct mem_cgroup *memcg = mem_cgroup_from_css(css);
+ /* should be called with activate_kmem_mutex held */
+ static int __memcg_activate_kmem(struct mem_cgroup *memcg,
+                                unsigned long long limit)
+ {
+       int err = 0;
+       int memcg_id;
+ 
+       if (memcg_kmem_is_active(memcg))
+               return 0;
+ 
+       /*
+        * We are going to allocate memory for data shared by all memory
+        * cgroups so let's stop accounting here.
+        */
+       memcg_stop_kmem_account();
+ 
        /*
         * For simplicity, we won't allow this to be disabled.  It also can't
         * be changed if the cgroup has children already, or if tasks had

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/page_cgroup.c
Simple merge

diff --cc mm/page_io.c
Simple merge

diff --cc mm/percpu.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge