Merge branch 'akpm-current/current'

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

diff --cc Documentation/vm/slub.rst
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc arch/m68k/configs/amcore_defconfig
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/pgtable.h
Simple merge

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

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

diff --cc arch/powerpc/mm/pgtable-book3s64.c
index ecd3156,9f154ef..c11c600
--- 1/arch/powerpc/mm/pgtable-book3s64.c
--- 2/arch/powerpc/mm/pgtable-book3s64.c
+++ b/arch/powerpc/mm/pgtable-book3s64.c
@@@ -401,24 -398,27 +398,49 @@@ void arch_report_meminfo(struct seq_fil
  }
  #endif /* CONFIG_PROC_FS */
  
 +/*
 + * For hash translation mode, we use the deposited table to store hash slot
 + * information and they are stored at PTRS_PER_PMD offset from related pmd
 + * location. Hence a pmd move requires deposit and withdraw.
 + *
 + * For radix translation with split pmd ptl, we store the deposited table in the
 + * pmd page. Hence if we have different pmd page we need to withdraw during pmd
 + * move.
 + *
 + * With hash we use deposited table always irrespective of anon or not.
 + * With radix we use deposited table only for anonymous mapping.
 + */
 +int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
 +                         struct spinlock *old_pmd_ptl,
 +                         struct vm_area_struct *vma)
 +{
 +      if (radix_enabled())
 +              return (new_pmd_ptl != old_pmd_ptl) && vma_is_anonymous(vma);
 +
 +      return true;
 +}
++
+ pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr,
+                            pte_t *ptep)
+ {
+       unsigned long pte_val;
+ 
+       /*
+        * Clear the _PAGE_PRESENT so that no hardware parallel update is
+        * possible. Also keep the pte_present true so that we don't take
+        * wrong fault.
+        */
+       pte_val = pte_update(vma->vm_mm, addr, ptep, _PAGE_PRESENT, _PAGE_INVALID, 0);
+ 
+       return __pte(pte_val);
+ 
+ }
+ 
+ void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr,
+                            pte_t *ptep, pte_t old_pte, pte_t pte)
+ {
+       if (radix_enabled())
+               return radix__ptep_modify_prot_commit(vma, addr,
+                                                     ptep, old_pte, pte);
+       set_pte_at(vma->vm_mm, addr, ptep, pte);
+ }

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/mm/pgtable.c
index 689b66f,b283b92..8485d6d
--- 1/arch/s390/mm/pgtable.c
--- 2/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@@ -318,11 -319,13 +319,12 @@@ pte_t ptep_modify_prot_start(struct vm_
        }
        return old;
  }
 -EXPORT_SYMBOL(ptep_modify_prot_start);
  
- void ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,
-                            pte_t *ptep, pte_t pte)
+ void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr,
+                            pte_t *ptep, pte_t old_pte, pte_t pte)
  {
        pgste_t pgste;
+       struct mm_struct *mm = vma->vm_mm;
  
        if (!MACHINE_HAS_NX)
                pte_val(pte) &= ~_PAGE_NOEXEC;

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/afs/super.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

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

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

diff --cc fs/pipe.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/internal.h
Simple merge

diff --cc fs/proc/root.c
index 6927b29,621e6ec..8b145e7
--- 1/fs/proc/root.c
--- 2/fs/proc/root.c
+++ b/fs/proc/root.c
@@@ -247,9 -154,9 +247,9 @@@ static int proc_root_getattr(const stru
  
  static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags)
  {
-       if (!proc_pid_lookup(dir, dentry, flags))
+       if (!proc_pid_lookup(dentry, flags))
                return NULL;
 -      
 +
        return proc_lookup(dir, dentry, flags);
  }
  

diff --cc include/linux/cgroup-defs.h
Simple merge

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

diff --cc include/linux/kernfs.h
index 822a64e,0cac120..14d07d3
--- 1/include/linux/kernfs.h
--- 2/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@@ -25,9 -25,8 +25,10 @@@ struct seq_file
  struct vm_area_struct;
  struct super_block;
  struct file_system_type;
- struct kernfs_fs_context;
 +struct fs_context;
 +
+ struct poll_table_struct;
+ 
  struct kernfs_open_node;
  struct kernfs_iattrs;
  

diff --cc include/linux/sched.h
index f29ab82,113c928..a36f732
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1411,6 -1423,8 +1425,7 @@@ extern struct pid *cad_pid
  #define PF_UMH                        0x02000000      /* I'm an Usermodehelper process */
  #define PF_NO_SETAFFINITY     0x04000000      /* Userland is not allowed to meddle with cpus_allowed */
  #define PF_MCE_EARLY          0x08000000      /* Early kill for mce process policy */
 -#define PF_MUTEX_TESTER               0x20000000      /* Thread belongs to the rt mutex tester */
+ #define PF_MEMALLOC_NOCMA     0x10000000      /* All allocation request will have _GFP_MOVABLE cleared */
  #define PF_FREEZER_SKIP               0x40000000      /* Freezer should not count it as freezable */
  #define PF_SUSPEND_TASK               0x80000000      /* This thread called freeze_processes() and should not be frozen */
  

diff --cc init/Kconfig
Simple merge

diff --cc init/init_task.c
Simple merge

diff --cc ipc/sem.c
Simple merge

diff --cc ipc/util.h
Simple merge

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

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

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

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge