diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-04 10:34:19 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-04 10:34:19 -0800 |
commit | f9aaa5b05ea376f4917ff2c838c4641a100fd1e2 (patch) | |
tree | cf23cd4182768330d8574b38dba655a37ac917bb /MAINTAINERS | |
parent | cff7f2237c2b494a07c90f70291588d218b77e14 (diff) | |
parent | 07d2505b963b2d30f747dce338211f51068b8765 (diff) | |
download | linux-f9aaa5b05ea376f4917ff2c838c4641a100fd1e2.tar.gz |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "10 patches. Subsystems affected by this patch series: ipc, MAINTAINERS, and mm (vmscan, debug, pagemap, kmemleak, and selftests)" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: kselftest/vm: revert "tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner" MAINTAINERS: update rppt's email mm/kmemleak: avoid scanning potential huge holes ipc/sem: do not sleep with a spin lock held mm/pgtable: define pte_index so that preprocessor could recognize it mm/page_table_check: check entries at pmd levels mm/khugepaged: unify collapse pmd clear, flush and free mm/page_table_check: use unsigned long for page counters and cleanup mm/debug_vm_pgtable: remove pte entry from the page table Revert "mm/page_isolation: unset migratetype directly for non Buddy page"
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb83dcbcb619..ce6dff39fc14 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12399,7 +12399,7 @@ F: include/uapi/linux/membarrier.h F: kernel/sched/membarrier.c MEMBLOCK -M: Mike Rapoport <rppt@linux.ibm.com> +M: Mike Rapoport <rppt@kernel.org> L: linux-mm@kvack.org S: Maintained F: Documentation/core-api/boot-time-mm.rst |