These apply to today's mmotm. Some merge notes:
* The missing item ("mremap_dontunmap") at the *top* of .gitignore for this patch will also being applied to linux.git in a separate patch [1].
The other missing item ("khugepaged") is added to *bottom* of .gitignore. This approach allows merging to work without manual intervention in this case.
[1] https://lore.kernel.org/r/20200517001245.361762-3-jhubbard@nvidia.com
John Hubbard (1): selftests/vm/.gitignore: add khugepaged, mremap_dontunmap
tools/testing/selftests/vm/.gitignore | 2 ++ 1 file changed, 2 insertions(+)
base-commit: 2bbf0589bfeb27800c730b76eacf34528eee5418
Add mremap_dontunmap and khugepaged to .gitignore.
Fixes: 6582dba23f8b ("khugepaged: add self test") Fixes: 0c28759ee3c9 ("selftests: add MREMAP_DONTUNMAP selftest") Cc: Kirill A. Shutemov kirill.shutemov@linux.intel.com Cc: Brian Geffon bgeffon@google.com Signed-off-by: John Hubbard jhubbard@nvidia.com --- tools/testing/selftests/vm/.gitignore | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/vm/.gitignore b/tools/testing/selftests/vm/.gitignore index 4ff9708277fb..ddf5426416fa 100644 --- a/tools/testing/selftests/vm/.gitignore +++ b/tools/testing/selftests/vm/.gitignore @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +mremap_dontunmap hugepage-mmap hugepage-shm map_hugetlb @@ -18,3 +19,4 @@ va_128TBswitch map_fixed_noreplace write_to_hugetlbfs hmm-tests +khugepaged
linux-kselftest-mirror@lists.linaro.org