diff --git a/CREDITS b/CREDITS index 198f675c419e37d2b963646b4fb12937979329cd..4e302a459ddf069ce3b59b3dd7bbebcd8476ef46 100644 --- a/CREDITS +++ b/CREDITS @@ -1439,6 +1439,10 @@ N: Justin Guyett E: jguyett@andrew.cmu.edu D: via-rhine net driver hacking +N: Nitin Gupta +E: ngupta@vflare.org +D: zsmalloc memory allocator and zram block device driver + N: Danny ter Haar E: dth@cistron.nl D: /proc/cpuinfo, reboot on panic , kernel pre-patch tester ;) diff --git a/MAINTAINERS b/MAINTAINERS index 096ae475e21cd95018290cb9c83e17898a8b5ba2..5c63d48847ab03ca29db3bddf27eccaec9b1013c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23002,8 +23002,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 @@ -23016,8 +23015,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