Merge branch 'akpm-current/current'

Conflicts:
	Documentation/block/cmdline-partition.txt
	drivers/block/aoe/aoeblk.c
	drivers/rtc/rtc-hid-sensor-time.c
	fs/namei.c
	fs/namespace.c
	include/linux/smp.h
	kernel/fork.c
	mm/mempolicy.c
	mm/mlock.c
	mm/sparse.c
	scripts/checkpatch.pl

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mm/hugetlbpage.c
index 54ee6163c1814453298272fdb182341e3a5ffcdf,3f3b6a7f9bcaf5c98dd54384481294d2d2bea1bb..c25dfb0d9a6cac85feba0fb1c0c6f8529975853c
--- 1/arch/arm/mm/hugetlbpage.c
--- 2/arch/arm/mm/hugetlbpage.c
+++ b/arch/arm/mm/hugetlbpage.c
@@@ -52,12 -68,39 +52,17 @@@ int huge_pmd_unshare(struct mm_struct *
        return 0;
  }
  
 -pte_t *huge_pte_alloc(struct mm_struct *mm,
 -                      unsigned long addr, unsigned long sz)
 -{
 -      pgd_t *pgd;
 -      pud_t *pud;
 -      pte_t *pte = NULL;
 -
 -      pgd = pgd_offset(mm, addr);
 -      pud = pud_alloc(mm, pgd, addr);
 -      if (pud)
 -              pte = (pte_t *)pmd_alloc(mm, pud, addr);
 -
 -      return pte;
 -}
 -
 -struct page *
 -follow_huge_pmd(struct mm_struct *mm, unsigned long address,
 -              pmd_t *pmd, int write)
 +int pmd_huge(pmd_t pmd)
  {
 -      struct page *page;
 -
 -      page = pte_page(*(pte_t *)pmd);
 -      if (page)
 -              page += ((address & ~PMD_MASK) >> PAGE_SHIFT);
 -      return page;
 +      return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
  }
  
 -int pmd_huge(pmd_t pmd)
 +int pmd_huge_support(void)
  {
 -      return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
 +      return 1;
  }
+ 
+ int pmd_huge_support(void)
+ {
+       return 1;
+ }

diff --cc arch/powerpc/kernel/rtas.c
Simple merge

diff --cc arch/tile/mm/highmem.c
Simple merge

diff --cc arch/x86/include/asm/checksum_32.h
Simple merge

diff --cc arch/x86/include/asm/e820.h
Simple merge

diff --cc arch/x86/include/asm/uaccess.h
Simple merge

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

diff --cc arch/x86/lib/csum-wrappers_64.c
index 7609e0e421ece96f6671cc7d2310e0c59402ac1b,aaba241b24e050b13eddbc27d3cf3763c989763a..25285007fe64b43fb8bea9a2456def2e5907b909
--- 1/arch/x86/lib/csum-wrappers_64.c
--- 2/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@@ -4,9 -4,9 +4,10 @@@
   *
   * Wrappers of assembly checksum functions for x86-64.
   */
+ #include <linux/sched.h>
  #include <asm/checksum.h>
  #include <linux/module.h>
 +#include <asm/smap.h>
  
  /**
   * csum_partial_copy_from_user - Copy and checksum from user space.

diff --cc block/blk-cgroup.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/atm/he.c
Simple merge

diff --cc drivers/base/dma-buf.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

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

diff --cc drivers/infiniband/hw/cxgb3/iwch_cm.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/cm.c
Simple merge

diff --cc drivers/isdn/mISDN/core.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

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

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/sfc/falcon.c
Simple merge

diff --cc drivers/net/irda/donauboe.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/wmi.c
Simple merge

diff --cc drivers/net/wireless/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/dma.c
Simple merge

diff --cc drivers/net/wireless/cw1200/cw1200_spi.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-op-mode.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-trans.h
Simple merge

diff --cc drivers/pci/iov.c
Simple merge

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

diff --cc drivers/staging/lustre/lustre/llite/remote_perm.c
index dedd56ae1e6d52f2ee3bab2fe209c2d42f928a14,ceac9360916a3457d1b19fab9e12b3539f1cd152..50de0f03ee4ff772dc6f661bbff66bbd1f30c681
--- 1/drivers/staging/lustre/lustre/llite/remote_perm.c
--- 2/drivers/staging/lustre/lustre/llite/remote_perm.c
+++ b/drivers/staging/lustre/lustre/llite/remote_perm.c
@@@ -44,7 -44,9 +44,8 @@@
  #define DEBUG_SUBSYSTEM S_LLITE
  
  #include <linux/module.h>
+ #include <linux/sched.h>
  #include <linux/types.h>
 -#include <linux/version.h>
  
  #include <lustre_lite.h>
  #include <lustre_ha.h>

diff --cc drivers/staging/lustre/lustre/obdclass/cl_lock.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/cl_object.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/cl_page.c
Simple merge

diff --cc drivers/staging/lustre/lustre/osc/osc_lock.c
Simple merge

diff --cc drivers/staging/lustre/lustre/osc/osc_page.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/client.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec_config.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/urb.c
Simple merge

diff --cc drivers/video/atmel_lcdfb.c
Simple merge

diff --cc fs/anon_inodes.c
Simple merge

diff --cc fs/autofs4/dev-ioctl.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/eventpoll.c
Simple merge

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

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

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/fat/file.c
index 33711ff2b4a3e495a886ef09c229431fbead4598,00b5810212da9b95e014262308c5caa3c22967cb..26c8e32180f2e25e1a2bf0c575745076a7ccb39b
--- 1/fs/fat/file.c
--- 2/fs/fat/file.c
+++ b/fs/fat/file.c
@@@ -148,6 -151,22 +151,22 @@@ static long fat_generic_compat_ioctl(st
  
  static int fat_file_release(struct inode *inode, struct file *filp)
  {
 -          filp->f_dentry->d_count == 1)
+ 
+       struct super_block *sb = inode->i_sb;
+       loff_t mmu_private_ideal;
+ 
+       /*
+        * Release unwritten fallocated blocks on file release.
+        * Do this only when the last open file descriptor is closed.
+        */
+       mutex_lock(&inode->i_mutex);
+       mmu_private_ideal = round_up(inode->i_size, sb->s_blocksize);
+ 
+       if (mmu_private_ideal < MSDOS_I(inode)->mmu_private &&
++          d_count(filp->f_dentry) == 1)
+               fat_truncate_blocks(inode, inode->i_size);
+       mutex_unlock(&inode->i_mutex);
+ 
        if ((filp->f_mode & FMODE_WRITE) &&
             MSDOS_SB(inode->i_sb)->options.flush) {
                fat_flush_inodes(inode->i_sb, inode, NULL);

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

diff --cc fs/file_table.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/nfs/nfs4state.c
Simple merge

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

diff --cc fs/xfs/xfs_mount.c
index 5dcc68019d1bc8c49a799695436045d69d49167f,eb9ba152fc3cd701377afd8c083d0b356d05c5e5..65dbf17e9578423dc22a9bfc3bdc97de58d7ea1b
--- 1/fs/xfs/xfs_mount.c
--- 2/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@@ -15,9 -15,10 +15,10 @@@
   * along with this program; if not, write the Free Software Foundation,
   * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   */
+ #include <linux/sched.h>
  #include "xfs.h"
  #include "xfs_fs.h"
 -#include "xfs_types.h"
 +#include "xfs_format.h"
  #include "xfs_bit.h"
  #include "xfs_log.h"
  #include "xfs_inum.h"

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

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

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

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/nsproxy.c
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

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

diff --cc kernel/smp.c
Simple merge

diff --cc kernel/watchdog.c
index 51c4f34d258ea397266e0dd1a96a16436415a38f,410d5bbe7f1fdfa5b7afa3171a0dd3dc2b108c1c..373d3e1356b264b2d848ff72fee2fc0a5976ca11
--- 1/kernel/watchdog.c
--- 2/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@@ -553,6 -607,14 +607,6 @@@ void __init lockup_detector_init(void
  {
        set_sample_period();
  
 -#ifdef CONFIG_NO_HZ_FULL
 -      if (watchdog_user_enabled) {
 -              watchdog_user_enabled = 0;
 -              pr_warning("Disabled lockup detectors by default for full dynticks\n");
 -              pr_warning("You can reactivate it with 'sysctl -w kernel.watchdog=1'\n");
 -      }
 -#endif
 -
        if (watchdog_user_enabled)
-               watchdog_enable_all_cpus();
+               watchdog_enable_all_cpus(false);
  }

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/rmap.c
Simple merge

diff --cc net/mac80211/driver-ops.h
Simple merge

diff --cc net/mac80211/key.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge

diff --cc scripts/mod/modpost.c
Simple merge

diff --cc scripts/sortextable.c
Simple merge