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
Showing
- .mailmap 1 addition, 0 deletions.mailmap
- Documentation/dev-tools/kasan.rst 1 addition, 2 deletionsDocumentation/dev-tools/kasan.rst
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- fs/Kconfig 1 addition, 1 deletionfs/Kconfig
- fs/nilfs2/file.c 1 addition, 0 deletionsfs/nilfs2/file.c
- fs/squashfs/block.c 7 additions, 1 deletionfs/squashfs/block.c
- fs/squashfs/export.c 33 additions, 8 deletionsfs/squashfs/export.c
- fs/squashfs/id.c 32 additions, 8 deletionsfs/squashfs/id.c
- fs/squashfs/squashfs_fs_sb.h 1 addition, 0 deletionsfs/squashfs/squashfs_fs_sb.h
- fs/squashfs/super.c 3 additions, 3 deletionsfs/squashfs/super.c
- fs/squashfs/xattr.h 9 additions, 1 deletionfs/squashfs/xattr.h
- fs/squashfs/xattr_id.c 57 additions, 9 deletionsfs/squashfs/xattr_id.c
- include/asm-generic/vmlinux.lds.h 1 addition, 1 deletioninclude/asm-generic/vmlinux.lds.h
- mm/kasan/hw_tags.c 2 additions, 6 deletionsmm/kasan/hw_tags.c
- mm/memcontrol.c 2 additions, 3 deletionsmm/memcontrol.c
- mm/mremap.c 3 additions, 2 deletionsmm/mremap.c
- mm/slub.c 16 additions, 2 deletionsmm/slub.c
- tools/testing/selftests/vm/run_vmtests.sh 0 additions, 0 deletionstools/testing/selftests/vm/run_vmtests.sh
Please register or sign in to comment