Commit 676cb495 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-nonmm-stable-2022-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull non-MM updates from Andrew Morton:

 - hfs and hfsplus kmap API modernization (Fabio Francesco)

 - make crash-kexec work properly when invoked from an NMI-time panic
   (Valentin Schneider)

 - ntfs bugfixes (Hawkins Jiawei)

 - improve IPC msg scalability by replacing atomic_t's with percpu
   counters (Jiebin Sun)

 - nilfs2 cleanups (Minghao Chi)

 - lots of other single patches all over the tree!

* tag 'mm-nonmm-stable-2022-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (71 commits)
  include/linux/entry-common.h: remove has_signal comment of arch_do_signal_or_restart() prototype
  proc: test how it holds up with mapping'less process
  mailmap: update Frank Rowand email address
  ia64: mca: use strscpy() is more robust and safer
  init/Kconfig: fix unmet direct dependencies
  ia64: update config files
  nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure
  fork: remove duplicate included header files
  init/main.c: remove unnecessary (void*) conversions
  proc: mark more files as permanent
  nilfs2: remove the unneeded result variable
  nilfs2: delete unnecessary checks before brelse()
  checkpatch: warn for non-standard fixes tag style
  usr/gen_init_cpio.c: remove unnecessary -1 values from int file
  ipc/msg: mitigate the lock contention with percpu counter
  percpu: add percpu_counter_add_local and percpu_counter_sub_local
  fs/ocfs2: fix repeated words in comments
  relay: use kvcalloc to alloc page array in relay_alloc_page_array
  proc: make config PROC_CHILDREN depend on PROC_FS
  fs: uninline inode_maybe_inc_iversion()
  ...
parents 95b8b595 6a961bff

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ Filipe Lautert <filipe@icewall.org> 
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Zago <fzago@systemfabricworks.com>

Documentation/admin-guide/sysctl/kernel.rst

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ combining the following values: 
4 s3_beep

= =======



arch

====



The machine hardware name, the same output as ``uname -m``

(e.g. ``x86_64`` or ``aarch64``).



auto_msgmni

===========

Documentation/dev-tools/checkpatch.rst

+7 −0
Original line number Diff line number Diff line
@@ -612,6 +612,13 @@ Commit message 


    See: https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes



  **BAD_FIXES_TAG**

    The Fixes: tag is malformed or does not follow the community conventions.

    This can occur if the tag have been split into multiple lines (e.g., when

    pasted in an email program with word wrapping enabled).



    See: https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes





Comparison style

----------------

arch/alpha/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ CONFIG_NFSD=m 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_ALPHA_LEGACY_START_ADDRESS=y

CONFIG_MATHEMU=y

CONFIG_CRYPTO_HMAC=y

arch/alpha/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ extern void start_thread(struct pt_regs *, unsigned long, unsigned long); 


/* Free all resources held by a thread. */

struct task_struct;

extern void release_thread(struct task_struct *);



unsigned long __get_wchan(struct task_struct *p);



#define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc)