The patch titled Subject: userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix has been removed from the -mm tree. Its filename was userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix.patch This patch was dropped because it was folded into userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix fix uffdio_zeropage(), per Mike Kravetz Cc: "Dr. David Alan Gilbert" <dgilbert@xxxxxxxxxx> Cc: Alexey Perevalov <a.perevalov@xxxxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Maxime Coquelin <maxime.coquelin@xxxxxxxxxx> Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- tools/testing/selftests/vm/userfaultfd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN tools/testing/selftests/vm/userfaultfd.c~userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix tools/testing/selftests/vm/userfaultfd.c --- a/tools/testing/selftests/vm/userfaultfd.c~userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix +++ a/tools/testing/selftests/vm/userfaultfd.c @@ -813,13 +813,14 @@ static int uffdio_zeropage(int ufd, unsi if (uffdio_zeropage.zeropage != page_size) { fprintf(stderr, "UFFDIO_ZEROPAGE unexpected %Ld\n", uffdio_zeropage.zeropage), exit(1); - } else + } else { if (test_uffdio_zeropage_eexist) { test_uffdio_zeropage_eexist = false; retry_uffdio_zeropage(ufd, &uffdio_zeropage, offset); } return 1; + } } else { fprintf(stderr, "UFFDIO_ZEROPAGE succeeded %Ld\n", _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist.patch mm-swap-add-swap-readahead-hit-statistics-fix.patch swap-choose-swap-device-according-to-numa-node-v2-fix.patch mmfork-introduce-madv_wipeonfork-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html