Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "12 patches. Subsystems affected by this patch series: sysctl, binfmt, ia64, mm (memory-failure, folios, kasan, and psi), selftests, and ocfs2" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: ocfs2: fix a deadlock when commit trans jbd2: export jbd2_journal_[grab|put]_journal_head psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n psi: fix "no previous prototype" warnings when CONFIG_CGROUPS=n mm, kasan: use compare-exchange operation to set KASAN page tag kasan: test: fix compatibility with FORTIFY_SOURCE tools/testing/scatterlist: add missing defines mm: page->mapping folio->mapping should have the same offset memory-failure: fetch compound_head after pgmap_pfn_valid() ia64: make IA64_MCA_RECOVERY bool instead of tristate binfmt_misc: fix crash when load/unload module include/linux/sysctl.h: fix register_sysctl_mount_point() return type
Showing
- arch/ia64/Kconfig 1 addition, 1 deletionarch/ia64/Kconfig
- fs/binfmt_misc.c 4 additions, 4 deletionsfs/binfmt_misc.c
- fs/jbd2/journal.c 2 additions, 0 deletionsfs/jbd2/journal.c
- fs/ocfs2/suballoc.c 11 additions, 14 deletionsfs/ocfs2/suballoc.c
- include/linux/mm.h 12 additions, 5 deletionsinclude/linux/mm.h
- include/linux/mm_types.h 1 addition, 0 deletionsinclude/linux/mm_types.h
- include/linux/psi.h 5 additions, 6 deletionsinclude/linux/psi.h
- include/linux/sysctl.h 1 addition, 1 deletioninclude/linux/sysctl.h
- kernel/sched/psi.c 41 additions, 38 deletionskernel/sched/psi.c
- lib/test_kasan.c 5 additions, 0 deletionslib/test_kasan.c
- mm/memory-failure.c 6 additions, 0 deletionsmm/memory-failure.c
- tools/testing/scatterlist/linux/mm.h 2 additions, 1 deletiontools/testing/scatterlist/linux/mm.h
Please register or sign in to comment