Merge branch 'akpm-current/current'

Conflicts:
	arch/x86/kernel/apic/hw_nmi.c
	fs/affs/super.c
	fs/hugetlbfs/inode.c
	mm/compaction.c
	mm/memblock.c
	mm/slab.h
	mm/slab_common.c

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

diff --cc Documentation/printk-formats.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/52xx/efika.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/apic/hw_nmi.c
index c3fcb5de508391ca20684669b3746a2c734cad02,1400d725c722ee7c90ec94923407a3bfc3ebac56..3dbfe1ef082b972ab7f4b1b1c5405e89d2a7dd53
--- 1/arch/x86/kernel/apic/hw_nmi.c
--- 2/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@@ -57,10 -65,11 +65,11 @@@ void arch_trigger_all_cpu_backtrace(boo
        }
  
        clear_bit(0, &backtrace_flag);
 -      smp_mb__after_clear_bit();
 +      smp_mb__after_atomic();
+       put_cpu();
  }
  
 -static int __kprobes
 +static int
  arch_trigger_all_cpu_backtrace_handler(unsigned int cmd, struct pt_regs *regs)
  {
        int cpu;

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc fs/9p/vfs_file.c
Simple merge

diff --cc fs/affs/file.c
Simple merge

diff --cc fs/bio.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/ceph/addr.c
Simple merge

diff --cc fs/ceph/inode.c
Simple merge

diff --cc fs/fat/file.c
Simple merge

diff --cc fs/fat/inode.c
index 385cce464e822a3a9de91113d1b314482670965f,d44c5107535afdd254fe36d8de90af4b0348eaab..e72afce295f36b8c4a0825cef0c67fb24e593c95
--- 1/fs/fat/inode.c
--- 2/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@@ -204,9 -288,16 +289,16 @@@ static ssize_t fat_direct_IO(int rw, st
                 *
                 * Return 0, and fallback to normal buffered write.
                 */
 -              loff_t size = offset + iov_length(iov, nr_segs);
 +              loff_t size = offset + count;
                if (MSDOS_I(inode)->mmu_private < size)
                        return 0;
+ 
+               /*
+                * In case of writing in fallocated region, return 0 and
+                * fallback to buffered write.
+                */
+               if (MSDOS_I(inode)->i_disksize > MSDOS_I(inode)->mmu_private)
+                       return 0;
        }
  
        /*

diff --cc fs/hugetlbfs/inode.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

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

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

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

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

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

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

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

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/acct.c
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc kernel/kmod.c
Simple merge

diff --cc kernel/rcu/update.c
Simple merge

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

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

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/dmapool.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memblock.c
index a810ba923cdd5304e655fd93e69a6f796e80e417,fc212b5fc1ace8a4d56349c66eb99320fefdcdfd..6d2f219a48b01d371c1eb763f611d29a346890d9
--- 1/mm/memblock.c
--- 2/mm/memblock.c
+++ b/mm/memblock.c
@@@ -691,7 -681,8 +691,8 @@@ int __init_memblock memblock_free(phys_
                     (unsigned long long)base + size - 1,
                     (void *)_RET_IP_);
  
 -      return __memblock_remove(&memblock.reserved, base, size);
+       kmemleak_free_part(__va(base), size);
 +      return memblock_remove_range(&memblock.reserved, base, size);
  }
  
  static int __init_memblock memblock_reserve_region(phys_addr_t base,

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/page_io.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc mm/vmscan.c
Simple merge