summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/mm/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing/selftests/mm/.gitignore')
-rw-r--r--tools/testing/selftests/mm/.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/mm/.gitignore b/tools/testing/selftests/mm/.gitignore
index 121000c28c10..824266982aa3 100644
--- a/tools/testing/selftests/mm/.gitignore
+++ b/tools/testing/selftests/mm/.gitignore
@@ -20,6 +20,7 @@ mremap_test
on-fault-limit
transhuge-stress
pagemap_ioctl
+pfnmap
*.tmp*
protection_keys
protection_keys_32
@@ -57,4 +58,5 @@ droppable
hugetlb_dio
pkey_sighandler_tests_32
pkey_sighandler_tests_64
-guard-pages
+guard-regions
+merge