Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jul 2021 19:08:10 +0000 (12:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jul 2021 19:08:10 +0000 (12:08 -0700)
Merge more updates from Andrew Morton:
 "190 patches.

  Subsystems affected by this patch series: mm (hugetlb, userfaultfd,
  vmscan, kconfig, proc, z3fold, zbud, ras, mempolicy, memblock,
  migration, thp, nommu, kconfig, madvise, memory-hotplug, zswap,
  zsmalloc, zram, cleanups, kfence, and hmm), procfs, sysctl, misc,
  core-kernel, lib, lz4, checkpatch, init, kprobes, nilfs2, hfs,
  signals, exec, kcov, selftests, compress/decompress, and ipc"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (190 commits)
  ipc/util.c: use binary search for max_idx
  ipc/sem.c: use READ_ONCE()/WRITE_ONCE() for use_global_lock
  ipc: use kmalloc for msg_queue and shmid_kernel
  ipc sem: use kvmalloc for sem_undo allocation
  lib/decompressors: remove set but not used variabled 'level'
  selftests/vm/pkeys: exercise x86 XSAVE init state
  selftests/vm/pkeys: refill shadow register after implicit kernel write
  selftests/vm/pkeys: handle negative sys_pkey_alloc() return code
  selftests/vm/pkeys: fix alloc_random_pkey() to make it really, really random
  kcov: add __no_sanitize_coverage to fix noinstr for all architectures
  exec: remove checks in __register_bimfmt()
  x86: signal: don't do sas_ss_reset() until we are certain that sigframe won't be abandoned
  hfsplus: report create_date to kstat.btime
  hfsplus: remove unnecessary oom message
  nilfs2: remove redundant continue statement in a while-loop
  kprobes: remove duplicated strong free_insn_page in x86 and s390
  init: print out unknown kernel parameters
  checkpatch: do not complain about positive return values starting with EPOLL
  checkpatch: improve the indented label test
  checkpatch: scripts/spdxcheck.py now requires python3
  ...

49 files changed:
1  2 
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/memory.h
arch/arm64/include/asm/page.h
arch/arm64/include/asm/pgtable.h
arch/arm64/kernel/setup.c
arch/arm64/kvm/mmu.c
arch/arm64/mm/init.c
arch/arm64/mm/mmu.c
arch/mips/Kconfig
arch/mips/include/asm/pgalloc.h
arch/s390/Kconfig
arch/s390/kernel/kprobes.c
arch/x86/Kconfig
arch/x86/include/asm/desc.h
arch/x86/kernel/cpu/mshyperv.c
arch/x86/kernel/kprobes/core.c
arch/x86/kernel/setup.c
drivers/block/zram/zram_drv.h
drivers/clk/analogbits/wrpll-cln28hpc.c
drivers/net/ipa/ipa_smp2p.c
fs/exec.c
fs/open.c
fs/userfaultfd.c
include/asm-generic/bug.h
include/linux/compiler_types.h
include/linux/hugetlb.h
include/linux/kernel.h
include/linux/kprobes.h
include/linux/mm.h
include/linux/mm_types.h
include/linux/page-flags.h
include/linux/shmem_fs.h
init/main.c
ipc/shm.c
kernel/hung_task.c
kernel/kprobes.c
kernel/signal.c
kernel/sysctl.c
lib/Kconfig.debug
lib/kstrtox.c
lib/vsprintf.c
mm/compaction.c
mm/memcontrol.c
mm/mlock.c
mm/page_alloc.c
mm/shmem.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/open.c
Simple merge
Simple merge
Simple merge
@@@ -210,7 -210,7 +210,7 @@@ struct ftrace_likely_data 
  /* Section for code which can't be instrumented at all */
  #define noinstr                                                               \
        noinline notrace __attribute((__section__(".noinstr.text")))    \
-       __no_kcsan __no_sanitize_address __no_profile
 -      __no_kcsan __no_sanitize_address __no_sanitize_coverage
++      __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage
  
  #endif /* __KERNEL__ */
  
Simple merge
   */
  #define lower_32_bits(n) ((u32)((n) & 0xffffffff))
  
 +/**
 + * upper_16_bits - return bits 16-31 of a number
 + * @n: the number we're accessing
 + */
 +#define upper_16_bits(n) ((u16)((n) >> 16))
 +
 +/**
 + * lower_16_bits - return bits 0-15 of a number
 + * @n: the number we're accessing
 + */
 +#define lower_16_bits(n) ((u16)((n) & 0xffff))
 +
  struct completion;
- struct pt_regs;
  struct user;
  
  #ifdef CONFIG_PREEMPT_VOLUNTARY
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc ipc/shm.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/signal.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
diff --cc lib/kstrtox.c
Simple merge
diff --cc lib/vsprintf.c
@@@ -86,9 -61,21 +86,10 @@@ static unsigned long long simple_strnto
   *
   * This function has caveats. Please use kstrtoull instead.
   */
+ noinline
  unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
  {
 -      unsigned long long result;
 -      unsigned int rv;
 -
 -      cp = _parse_integer_fixup_radix(cp, &base);
 -      rv = _parse_integer(cp, base, &result);
 -      /* FIXME */
 -      cp += (rv & ~KSTRTOX_OVERFLOW);
 -
 -      if (endp)
 -              *endp = (char *)cp;
 -
 -      return result;
 +      return simple_strntoull(cp, INT_MAX, endp, base);
  }
  EXPORT_SYMBOL(simple_strtoull);
  
diff --cc mm/compaction.c
Simple merge
diff --cc mm/memcontrol.c
Simple merge
diff --cc mm/mlock.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc mm/shmem.c
Simple merge