Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2021 19:55:35 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2021 19:55:35 +0000 (12:55 -0700)
Merge more updates from Andrew Morton:
 "147 patches, based on 7d2a07b769330c34b4deabeed939325c77a7ec2f.

  Subsystems affected by this patch series: mm (memory-hotplug, rmap,
  ioremap, highmem, cleanups, secretmem, kfence, damon, and vmscan),
  alpha, percpu, procfs, misc, core-kernel, MAINTAINERS, lib,
  checkpatch, epoll, init, nilfs2, coredump, fork, pids, criu, kconfig,
  selftests, ipc, and scripts"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (94 commits)
  scripts: check_extable: fix typo in user error message
  mm/workingset: correct kernel-doc notations
  ipc: replace costly bailout check in sysvipc_find_ipc()
  selftests/memfd: remove unused variable
  Kconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH
  configs: remove the obsolete CONFIG_INPUT_POLLDEV
  prctl: allow to setup brk for et_dyn executables
  pid: cleanup the stale comment mentioning pidmap_init().
  kernel/fork.c: unexport get_{mm,task}_exe_file
  coredump: fix memleak in dump_vma_snapshot()
  fs/coredump.c: log if a core dump is aborted due to changed file permissions
  nilfs2: use refcount_dec_and_lock() to fix potential UAF
  nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group
  nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
  nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group
  nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group
  nilfs2: fix NULL pointer in nilfs_##name##_attr_release
  nilfs2: fix memory leak in nilfs_sysfs_create_device_group
  trap: cleanup trap_init()
  init: move usermodehelper_enable() to populate_rootfs()
  ...

35 files changed:
1  2 
Documentation/kbuild/llvm.rst
MAINTAINERS
arch/Kconfig
arch/powerpc/kernel/traps.c
arch/powerpc/platforms/pseries/hotplug-memory.c
arch/riscv/Kconfig
arch/s390/mm/init.c
drivers/base/memory.c
drivers/base/node.c
drivers/mtd/nand/raw/intel-nand-controller.c
include/linux/memory.h
include/linux/mmzone.h
include/linux/page-flags.h
include/linux/pagemap.h
include/linux/units.h
include/trace/events/mmflags.h
init/main.c
kernel/fork.c
kernel/sys.c
lib/Kconfig.debug
lib/test_printf.c
lib/vsprintf.c
mm/compaction.c
mm/kfence/kfence_test.c
mm/kfence/report.c
mm/memory_hotplug.c
mm/page_alloc.c
mm/page_isolation.c
mm/percpu.c
mm/rmap.c
mm/vmalloc.c
tools/perf/builtin-c2c.c
tools/perf/builtin-record.c
tools/perf/util/header.c
tools/testing/selftests/kvm/dirty_log_perf_test.c

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/Kconfig
Simple merge
Simple merge
@@@ -50,11 -48,9 +50,11 @@@ config RISC
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_EARLY_IOREMAP
        select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO
-       select GENERIC_IOREMAP
 +      select GENERIC_IDLE_POLL_SETUP
+       select GENERIC_IOREMAP if MMU
        select GENERIC_IRQ_MULTI_HANDLER
        select GENERIC_IRQ_SHOW
 +      select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_LIB_DEVMEM_IS_ALLOWED
        select GENERIC_PCI_IOMAP
        select GENERIC_PTDUMP if MMU
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -4,25 -4,13 +4,29 @@@
  
  #include <linux/math.h>
  
- #define MILLIWATT_PER_WATT    1000L
- #define MICROWATT_PER_MILLIWATT       1000L
- #define MICROWATT_PER_WATT    1000000L
 +/* Metric prefixes in accordance with Système international (d'unités) */
 +#define PETA  1000000000000000ULL
 +#define TERA  1000000000000ULL
 +#define GIGA  1000000000UL
 +#define MEGA  1000000UL
 +#define KILO  1000UL
 +#define HECTO 100UL
 +#define DECA  10UL
 +#define DECI  10UL
 +#define CENTI 100UL
 +#define MILLI 1000UL
 +#define MICRO 1000000UL
 +#define NANO  1000000000UL
 +#define PICO  1000000000000ULL
 +#define FEMTO 1000000000000000ULL
 +
+ #define HZ_PER_KHZ            1000UL
+ #define KHZ_PER_MHZ           1000UL
+ #define HZ_PER_MHZ            1000000UL
+ #define MILLIWATT_PER_WATT    1000UL
+ #define MICROWATT_PER_MILLIWATT       1000UL
+ #define MICROWATT_PER_WATT    1000000UL
  
  #define ABSOLUTE_ZERO_MILLICELSIUS -273150
  
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sys.c
Simple merge
Simple merge
Simple merge
diff --cc lib/vsprintf.c
Simple merge
diff --cc mm/compaction.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
Simple merge
diff --cc mm/percpu.c
Simple merge
diff --cc mm/rmap.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
Simple merge
Simple merge
Simple merge