Commit 4b16b656 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "14 patches.

  Subsystems affected by this patch series: mm (kasan, mremap, tmpfs,
  selftests, memcg, and slub), MAINTAINERS, squashfs, nilfs2, and
  firmware"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  nilfs2: make splice write available again
  mm, slub: better heuristic for number of cpus when calculating slab order
  Revert "mm: memcontrol: avoid workload stalls when lowering memory.high"
  MAINTAINERS: update Andrey Ryabinin's email address
  selftests/vm: rename file run_vmtests to run_vmtests.sh
  tmpfs: disallow CONFIG_TMPFS_INODE64 on alpha
  tmpfs: disallow CONFIG_TMPFS_INODE64 on s390
  mm/mremap: fix BUILD_BUG_ON() error in get_extent
  firmware_loader: align .builtin_fw to 8
  kasan: fix stack traces dependency for HW_TAGS
  squashfs: add more sanity checks in xattr id lookup
  squashfs: add more sanity checks in inode lookup
  squashfs: add more sanity checks in id lookup
  squashfs: avoid out of bounds writes in decompressors
parents ef7d0b59 a35d8f01

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk> 
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>

Documentation/dev-tools/kasan.rst

+1 −2
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ particular KASAN features. 
- ``kasan=off`` or ``=on`` controls whether KASAN is enabled (default: ``on``).



- ``kasan.stacktrace=off`` or ``=on`` disables or enables alloc and free stack

  traces collection (default: ``on`` for ``CONFIG_DEBUG_KERNEL=y``, otherwise

  ``off``).

  traces collection (default: ``on``).



- ``kasan.fault=report`` or ``=panic`` controls whether to only print a KASAN

  report or also panic the kernel (default: ``report``).

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9559,7 +9559,7 @@ F: Documentation/hwmon/k8temp.rst 
F:	drivers/hwmon/k8temp.c









KASAN









M:	Andrey Ryabinin <aryabinin@virtuozzo.com>









M:	Andrey Ryabinin <ryabinin.a.a@gmail.com>









R:	Alexander Potapenko <glider@google.com>









R:	Dmitry Vyukov <dvyukov@google.com>









L:	kasan-dev@googlegroups.com
































fs/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -203,7 +203,7 @@ config TMPFS_XATTR

















config TMPFS_INODE64









	bool "Use 64-bit ino_t by default in tmpfs"









	depends on TMPFS && 64BIT









	depends on TMPFS && 64BIT && !(S390 || ALPHA)









	default n









	help









	  tmpfs has historically used only inode numbers as wide as an unsigned
































fs/nilfs2/file.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -141,6 +141,7 @@ const struct file_operations nilfs_file_operations = {







	/* .release	= nilfs_release_file, */









	.fsync		= nilfs_sync_file,









	.splice_read	= generic_file_splice_read,









	.splice_write   = iter_file_splice_write,









};



















const struct inode_operations nilfs_file_inode_operations = {