diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-06 02:05:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-06 02:05:38 +0200 |
commit | 815b196c7057356e7ffa9ce97892cb5fd5de17e0 (patch) | |
tree | 9c8c544a1b8037d5eb2c7ca7c99758abd3c7efa4 /MAINTAINERS | |
parent | Merge tag 'mm-nonmm-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery (diff) | |
download | linux-815b196c7057356e7ffa9ce97892cb5fd5de17e0.tar.xz linux-815b196c7057356e7ffa9ce97892cb5fd5de17e0.zip |
Merge tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull mm hotfixes from Andrew Morton:
"Fixups for various recently-added and longer-term issues and a few
minor tweaks:
- fixes for material merged during this merge window
- cc:stable fixes for more longstanding issues
- minor mailmap and MAINTAINERS updates"
* tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery
x86/kexec: fix memory leak of elf header buffer
mm/memremap: fix missing call to untrack_pfn() in pagemap_range()
mm: page_isolation: use compound_nr() correctly in isolate_single_pageblock()
mm: hugetlb_vmemmap: fix CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON
MAINTAINERS: add maintainer information for z3fold
mailmap: update Josh Poimboeuf's email
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b54288db77aa..a6d3bd9d2a8d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22002,6 +22002,13 @@ L: linux-mm@kvack.org S: Maintained F: mm/zbud.c +Z3FOLD COMPRESSED PAGE ALLOCATOR +M: Vitaly Wool <vitaly.wool@konsulko.com> +R: Miaohe Lin <linmiaohe@huawei.com> +L: linux-mm@kvack.org +S: Maintained +F: mm/z3fold.c + ZD1211RW WIRELESS DRIVER M: Ulrich Kunitz <kune@deine-taler.de> L: linux-wireless@vger.kernel.org |