]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2021 18:11:53 +0000 (10:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2021 18:11:53 +0000 (10:11 -0800)
Merge more updates from Andrew Morton:
 "87 patches.

  Subsystems affected by this patch series: mm (pagecache and hugetlb),
  procfs, misc, MAINTAINERS, lib, checkpatch, binfmt, kallsyms, ramfs,
  init, codafs, nilfs2, hfs, crash_dump, signals, seq_file, fork,
  sysvfs, kcov, gdb, resource, selftests, and ipc"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (87 commits)
  ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL
  ipc: check checkpoint_restore_ns_capable() to modify C/R proc files
  selftests/kselftest/runner/run_one(): allow running non-executable files
  virtio-mem: disallow mapping virtio-mem memory via /dev/mem
  kernel/resource: disallow access to exclusive system RAM regions
  kernel/resource: clean up and optimize iomem_is_exclusive()
  scripts/gdb: handle split debug for vmlinux
  kcov: replace local_irq_save() with a local_lock_t
  kcov: avoid enable+disable interrupts if !in_task()
  kcov: allocate per-CPU memory on the relevant node
  Documentation/kcov: define `ip' in the example
  Documentation/kcov: include types.h in the example
  sysv: use BUILD_BUG_ON instead of runtime check
  kernel/fork.c: unshare(): use swap() to make code cleaner
  seq_file: fix passing wrong private data
  seq_file: move seq_escape() to a header
  signal: remove duplicate include in signal.h
  crash_dump: remove duplicate include in crash_dump.h
  crash_dump: fix boolreturn.cocci warning
  hfs/hfsplus: use WARN_ON for sanity check
  ...

32 files changed:
1  2 
.mailmap
MAINTAINERS
arch/powerpc/mm/pgtable_32.c
arch/x86/kernel/unwind_orc.c
drivers/gpu/drm/drm_dp_mst_topology.c
drivers/gpu/drm/i915/i915_vma.c
drivers/virtio/Kconfig
fs/binfmt_elf.c
fs/inode.c
fs/internal.h
fs/nilfs2/ioctl.c
fs/nilfs2/super.c
fs/nilfs2/the_nilfs.c
fs/proc/base.c
fs/proc/vmcore.c
fs/ramfs/inode.c
include/linux/fs.h
include/linux/kernel.h
include/linux/pagemap.h
include/linux/sbitmap.h
include/linux/signal.h
include/linux/spinlock.h
init/main.c
kernel/fork.c
kernel/locking/lockdep.c
kernel/trace/ftrace.c
lib/vsprintf.c
mm/filemap.c
mm/kasan/report.c
mm/page_owner.c
mm/vmscan.c
mm/workingset.c

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
index 170bbbeefc3f4ff39e9d6b56f43214841a5e4e68,1cfe2b4e094eda27f742786060a17489f00f1c01..a2bd991db512da333ee433f42f576d1125bc6977
@@@ -7117,8 -7036,21 +7117,22 @@@ F:    include/linux/platform_data/mdio-gpi
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
 +F:    net/core/of_net.c
  
+ EXEC & BINFMT API
+ R:    Eric Biederman <ebiederm@xmission.com>
+ R:    Kees Cook <keescook@chromium.org>
+ F:    arch/alpha/kernel/binfmt_loader.c
+ F:    arch/x86/ia32/ia32_aout.c
+ F:    fs/*binfmt_*.c
+ F:    fs/exec.c
+ F:    include/linux/binfmts.h
+ F:    include/linux/elf.h
+ F:    include/uapi/linux/binfmts.h
+ F:    tools/testing/selftests/exec/
+ N:    asm/elf.h
+ N:    binfmt
  EXFAT FILE SYSTEM
  M:    Namjae Jeon <linkinjeon@kernel.org>
  M:    Sungjong Seo <sj1557.seo@samsung.com>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/binfmt_elf.c
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/internal.h
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
Simple merge
diff --cc lib/vsprintf.c
Simple merge
diff --cc mm/filemap.c
Simple merge
Simple merge
diff --cc mm/page_owner.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
diff --cc mm/workingset.c
Simple merge