merge mm-hotfixes-stable into mm-nonmm-stable to pick up stackdepot c…

…hanges
torvalds · Feb 24, 2024 · 1f1183c · 1f1183c
2 parents 7d8cebb + 720da1e
commit 1f1183c
Show file tree

Hide file tree

Showing 10 changed files with 197 additions and 225 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -14111,6 +14111,17 @@ F: mm/
 F: tools/mm/
 F: tools/testing/selftests/mm/
 
+MEMORY MAPPING
+M: Andrew Morton <[email protected]>
+R: Liam R. Howlett <[email protected]>
+R: Vlastimil Babka <[email protected]>
+R: Lorenzo Stoakes <[email protected]>
+L: [email protected]
+S: Maintained
+W: http:https://www.linux-mm.org
+T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+F: mm/mmap.c
+
 MEMORY TECHNOLOGY DEVICES (MTD)
 M: Miquel Raynal <[email protected]>
 M: Richard Weinberger <[email protected]>

diff --git a/include/linux/poison.h b/include/linux/poison.h
@@ -92,4 +92,7 @@
 /********** VFS **********/
 #define VFS_PTR_POISON ((void *)(0xF5 + POISON_POINTER_DELTA))
 
+/********** lib/stackdepot.c **********/
+#define STACK_DEPOT_POISON ((void *)(0xD390 + POISON_POINTER_DELTA))
+
 #endif