[Based on linus/master, commit ac08b1c68d1b which should contain the recent -mm pull, if not applicable, I can repost anytime] v3: - Patch "mm: Add zap_skip_check_mapping() helper" - In zap_skip_check_mapping() check zap_mapping first [Alistair] - Patch "mm: Add ZAP_FLAG_SKIP_SWAP and zap_flags": - Fix English errors in commit message [David] - Drop paragraph mentioning commit 22061a1ffabd in commit msg - Set ZAP_FLAG_SKIP_SWAP for unmap_mapping_page() too - Pick up r-bs v2: - Patch "mm: Clear vmf->pte after pte_unmap_same() returns" - Remove one comment [David] - Collect r-b for patch 2/3 - Rewrite the last two patches to drop ZAP_FLAG_CHECK_MAPPING, dropping Alistair's r-b on patch 5 because it changed [David, Matthew] ===== v1 cover letter ===== I picked up these patches from uffd-wp v5 series here: https://lore.kernel.org/lkml/20210715201422.211004-1-peterx@xxxxxxxxxx/ IMHO all of them are very nice cleanups to existing code already, they're all small and self-contained. They'll be needed by uffd-wp coming series. I would appreciate if they can be accepted earlier, so as to not carry them over always with the uffd-wp series. I removed some CC from the uffd-wp v5 series to reduce the noise, and added a few more into it. Reviews are greatly welcomed, thanks. Peter Xu (5): mm/shmem: Unconditionally set pte dirty in mfill_atomic_install_pte mm: Clear vmf->pte after pte_unmap_same() returns mm: Drop first_index/last_index in zap_details mm: Add zap_skip_check_mapping() helper mm: Add ZAP_FLAG_SKIP_SWAP and zap_flags include/linux/mm.h | 34 +++++++++++++++++++-- mm/memory.c | 76 +++++++++++++++++++--------------------------- mm/shmem.c | 1 - mm/userfaultfd.c | 3 +- 4 files changed, 63 insertions(+), 51 deletions(-) -- 2.31.1