diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-19 13:58:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-19 13:58:57 +0100 |
| commit | 1ea9d333ba475041efe43d9d9bc32e64aea2ea2b (patch) | |
| tree | 7f47a7769d0a81b3c0e0b695a3eda9b56381cb45 /MAINTAINERS | |
| parent | Merge tag 'x86_mm_for_6.2_v2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | MAINTAINERS: zram: zsmalloc: Add an additional co-maintainer (diff) | |
| download | linux-1ea9d333ba475041efe43d9d9bc32e64aea2ea2b.tar.xz linux-1ea9d333ba475041efe43d9d9bc32e64aea2ea2b.zip | |
Merge tag 'mm-stable-2022-12-17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull more mm updates from Andrew Morton:
- A few late-breaking minor fixups
- Two minor feature patches which were awkwardly dependent on mm-nonmm.
I need to set up a new branch to handle such things.
* tag 'mm-stable-2022-12-17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
MAINTAINERS: zram: zsmalloc: Add an additional co-maintainer
mm/kmemleak: use %pK to display kernel pointers in backtrace
mm: use stack_depot for recording kmemleak's backtrace
maple_tree: update copyright dates for test code
maple_tree: fix mas_find_rev() comment
mm/gup_test: free memory allocated via kvcalloc() using kvfree()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 28cc7862a187..204aeacc516b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23055,8 +23055,7 @@ F: drivers/media/pci/zoran/ ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER M: Minchan Kim <minchan@kernel.org> -M: Nitin Gupta <ngupta@vflare.org> -R: Sergey Senozhatsky <senozhatsky@chromium.org> +M: Sergey Senozhatsky <senozhatsky@chromium.org> L: linux-kernel@vger.kernel.org S: Maintained F: Documentation/admin-guide/blockdev/zram.rst @@ -23069,8 +23068,7 @@ F: drivers/tty/serial/zs.* ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR M: Minchan Kim <minchan@kernel.org> -M: Nitin Gupta <ngupta@vflare.org> -R: Sergey Senozhatsky <senozhatsky@chromium.org> +M: Sergey Senozhatsky <senozhatsky@chromium.org> L: linux-mm@kvack.org S: Maintained F: Documentation/mm/zsmalloc.rst |