Commit c4cf498d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:
 "155 patches.

  Subsystems affected by this patch series: mm (dax, debug, thp,
  readahead, page-poison, util, memory-hotplug, zram, cleanups), misc,
  core-kernel, get_maintainer, MAINTAINERS, lib, bitops, checkpatch,
  binfmt, ramfs, autofs, nilfs, rapidio, panic, relay, kgdb, ubsan,
  romfs, and fault-injection"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (155 commits)
  lib, uaccess: add failure injection to usercopy functions
  lib, include/linux: add usercopy failure capability
  ROMFS: support inode blocks calculation
  ubsan: introduce CONFIG_UBSAN_LOCAL_BOUNDS for Clang
  sched.h: drop in_ubsan field when UBSAN is in trap mode
  scripts/gdb/tasks: add headers and improve spacing format
  scripts/gdb/proc: add struct mount & struct super_block addr in lx-mounts command
  kernel/relay.c: drop unneeded initialization
  panic: dump registers on panic_on_warn
  rapidio: fix the missed put_device() for rio_mport_add_riodev
  rapidio: fix error handling path
  nilfs2: fix some kernel-doc warnings for nilfs2
  autofs: harden ioctl table
  ramfs: fix nommu mmap with gaps in the page cache
  mm: remove the now-unnecessary mmget_still_valid() hack
  mm/gup: take mmap_lock in get_dump_page()
  binfmt_elf, binfmt_elf_fdpic: use a VMA list snapshot
  coredump: rework elf/elf_fdpic vma_dump_size() into common helper
  coredump: refactor page range dumping into common helper
  coredump: let dump_emit() bail out on short writes
  ...
parents 9ff9b0d3 4d0e9df5

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ James Ketrenos <jketreno@io.(none)> 
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Documentation/admin-guide/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,7 @@ 
			current integrity status.



	failslab=

	fail_usercopy=

	fail_page_alloc=

	fail_make_request=[KNL]

			General fault injection mechanism.

Documentation/core-api/xarray.rst

+9 −7
Original line number Diff line number Diff line
@@ -475,13 +475,15 @@ or iterations will move the index to the first index in the range. 
Each entry will only be returned once, no matter how many indices it

occupies.



Using xas_next() or xas_prev() with a multi-index xa_state

is not supported.  Using either of these functions on a multi-index entry

will reveal sibling entries; these should be skipped over by the caller.



Storing ``NULL`` into any index of a multi-index entry will set the entry

at every index to ``NULL`` and dissolve the tie.  Splitting a multi-index

entry into entries occupying smaller ranges is not yet supported.

Using xas_next() or xas_prev() with a multi-index xa_state is not

supported.  Using either of these functions on a multi-index entry will

reveal sibling entries; these should be skipped over by the caller.



Storing ``NULL`` into any index of a multi-index entry will set the

entry at every index to ``NULL`` and dissolve the tie.  A multi-index

entry can be split into entries occupying smaller ranges by calling

xas_split_alloc() without the xa_lock held, followed by taking the lock

and calling xas_split().



Functions and structures

========================

Documentation/fault-injection/fault-injection.rst

+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ Available fault injection capabilities 


  injects page allocation failures. (alloc_pages(), get_free_pages(), ...)



- fail_usercopy



  injects failures in user memory access functions. (copy_from_user(), get_user(), ...)



- fail_futex



  injects futex deadlock and uaddr fault errors.
@@ -177,6 +181,7 @@ use the boot option:: 


	failslab=

	fail_page_alloc=

	fail_usercopy=

	fail_make_request=

	fail_futex=

	mmc_core.fail_request=<interval>,<probability>,<space>,<times>
@@ -222,7 +227,7 @@ How to add new fault injection capability 


- debugfs entries



  failslab, fail_page_alloc, and fail_make_request use this way.

  failslab, fail_page_alloc, fail_usercopy, and fail_make_request use this way.

  Helper functions:



	fault_create_debugfs_attr(name, parent, attr);

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -9715,7 +9715,7 @@ F: security/keys/encrypted-keys/ 








KEYS-TRUSTED









M:	James Bottomley <jejb@linux.ibm.com>









M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>









M:	Jarkko Sakkinen <jarkko@kernel.org>









M:	Mimi Zohar <zohar@linux.ibm.com>









L:	linux-integrity@vger.kernel.org









L:	keyrings@vger.kernel.org








@@ -9727,7 +9727,7 @@ F:	security/keys/trusted-keys/















KEYS/KEYRINGS









M:	David Howells <dhowells@redhat.com>









M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>









M:	Jarkko Sakkinen <jarkko@kernel.org>









L:	keyrings@vger.kernel.org









S:	Maintained









F:	Documentation/security/keys/core.rst








@@ -17717,7 +17717,7 @@ F:	drivers/platform/x86/toshiba-wmi.c















TPM DEVICE DRIVER









M:	Peter Huewe <peterhuewe@gmx.de>









M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>









M:	Jarkko Sakkinen <jarkko@kernel.org>









R:	Jason Gunthorpe <jgg@ziepe.ca>









L:	linux-integrity@vger.kernel.org









S:	Maintained

































































CRA Git | Maintained and supported by SUSTech CRA and CCSE