Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "10 patches. Subsystems affected by this patch series: MAINTAINERS and mm (shmem, pagealloc, tracing, memcg, memory-failure, vmscan, kfence, and hugetlb)" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: hugetlb: don't pass page cache pages to restore_reserve_on_error kfence: fix is_kfence_address() for addresses below KFENCE_POOL_SIZE mm: vmscan: fix missing psi annotation for node_reclaim() mm/hwpoison: retry with shake_page() for unhandlable pages mm: memcontrol: fix occasional OOMs due to proportional memory.low reclaim MAINTAINERS: update ClangBuiltLinux IRC chat mmflags.h: add missing __GFP_ZEROTAGS and __GFP_SKIP_KASAN_POISON names mm/page_alloc: don't corrupt pcppage_migratetype Revert "mm: swap: check if swap backing device is congested or not" Revert "mm/shmem: fix shmem_swapin() race with swapoff"
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- include/linux/kfence.h 4 additions, 3 deletionsinclude/linux/kfence.h
- include/linux/memcontrol.h 15 additions, 14 deletionsinclude/linux/memcontrol.h
- include/trace/events/mmflags.h 3 additions, 1 deletioninclude/trace/events/mmflags.h
- mm/hugetlb.c 14 additions, 5 deletionsmm/hugetlb.c
- mm/memory-failure.c 9 additions, 3 deletionsmm/memory-failure.c
- mm/page_alloc.c 12 additions, 13 deletionsmm/page_alloc.c
- mm/shmem.c 1 addition, 13 deletionsmm/shmem.c
- mm/swap_state.c 0 additions, 7 deletionsmm/swap_state.c
- mm/vmscan.c 22 additions, 8 deletionsmm/vmscan.c
Please register or sign in to comment