Merge branch 'akpm-current/current'

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

diff --cc Documentation/admin-guide/sysctl/kernel.rst
Simple merge

diff --cc Documentation/admin-guide/sysctl/vm.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/include/asm/memory.h
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

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

diff --cc arch/arm64/kvm/mmu.c
index 5742ba765ff954050f0b2dca90fcc1946381d120,5e0d40f9fb867816c4cfdb141717ea56b9a944e7..346f4b7c84becdfa11ac1ce9318985268e3399b7
--- 1/arch/arm64/kvm/mmu.c
--- 2/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -882,12 -853,9 +882,12 @@@ static int user_mem_abort(struct kvm_vc
                return -EFAULT;
        }
  
 -      /* Let's check if we will get back a huge page backed by hugetlbfs */
 +      /*
 +       * Let's check if we will get back a huge page backed by hugetlbfs, or
 +       * get block mapping for device MMIO region.
 +       */
        mmap_read_lock(current->mm);
-       vma = find_vma_intersection(current->mm, hva, hva + 1);
+       vma = vma_lookup(current->mm, hva);
        if (unlikely(!vma)) {
                kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
                mmap_read_unlock(current->mm);

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

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

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

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

diff --cc arch/riscv/Kconfig
index 2eedaf621bc786b9a723968b0f2abbfb8da4a822,6ee11ca998b2aa4f31afa32b0e0bcc26fc244cf2..ddb2230c61b791a9ac8e12f58e7711c7cf0e8d45
--- 1/arch/riscv/Kconfig
--- 2/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -106,7 -104,7 +106,8 @@@ config RISC
        select SYSCTL_EXCEPTION_TRACE
        select THREAD_INFO_IN_TASK
        select UACCESS_MEMCPY if !MMU
 +      select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
+       select ZONE_DMA32 if 64BIT
  
  config ARCH_MMAP_RND_BITS_MIN
        default 18 if 64BIT

diff --cc arch/riscv/include/asm/pgtable.h
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/include/asm/pgtable.h
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

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

diff --cc drivers/base/node.c
Simple merge

diff --cc drivers/block/zram/zram_drv.h
index 74c411911b6eacc82cd32c69523b3886b14034dc,6e73dc3c276903e07ba06b7d8845e2df30b2f10d..80c3b43b4828fa553a1daaf0403e2c4776ddc3f3
--- 1/drivers/block/zram/zram_drv.h
--- 2/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@@ -112,9 -112,9 +112,9 @@@ struct zram 
        /*
         * zram is claimed so open request will be failed
         */
 -      bool claim; /* Protected by bdev->bd_mutex */
 +      bool claim; /* Protected by disk->open_mutex */
-       struct file *backing_dev;
  #ifdef CONFIG_ZRAM_WRITEBACK
+       struct file *backing_dev;
        spinlock_t wb_limit_lock;
        bool wb_limit_enable;
        u64 bd_wb_limit;

diff --cc drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
Simple merge

diff --cc drivers/misc/pvpanic/pvpanic.c
Simple merge

diff --cc drivers/remoteproc/remoteproc_core.c
Simple merge

diff --cc drivers/s390/char/con3215.c
Simple merge

diff --cc drivers/s390/char/sclp_vt220.c
Simple merge

diff --cc drivers/vfio/vfio_iommu_type1.c
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/exec.c
Simple merge

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

diff --cc fs/open.c
Simple merge

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

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

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

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

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

diff --cc init/main.c
Simple merge

diff --cc ipc/shm.c
Simple merge

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

diff --cc kernel/events/uprobes.c
Simple merge

diff --cc kernel/fork.c
Simple merge

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

diff --cc kernel/signal.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/vsprintf.c
Simple merge

diff --cc mm/memblock.c
Simple merge

diff --cc mm/mlock.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/slab.h
Simple merge

diff --cc mm/slab_common.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc scripts/link-vmlinux.sh
Simple merge