[PATCH v3 0/2] userfaultfd: merge fs/userfaultfd.c into mm/userfaultfd.c

[Mike Rapoport]

From: "Mike Rapoport (Microsoft)" <rppt@xxxxxxxxxx>

Hi,

These patches merge fs/userfaultfd.c into mm/userfaultfd.c and make
functions used only inside mm/userfaultfd.c static.

v3 changes:
* rebase on the current mm-unstable
* drop the fix for mremap_userfaultfd_fail() that's already merged

v2: https://lore.kernel.org/all/20260501145433.156211-1-rppt@xxxxxxxxxx
* add a fix for pre-existing bug found by sashiko as a separate patch

v1: https://lore.kernel.org/all/20260430113512.115938-1-rppt@xxxxxxxxxx

Mike Rapoport (Microsoft) (2):
  userfaultfd: merge fs/userfaultfd.c into mm/userfaultfd.c
  userfaultfd: make functions that are not used outside uffd static

 MAINTAINERS                   |    1 -
 fs/Makefile                   |    1 -
 fs/userfaultfd.c              | 2233 --------------------------------
 include/linux/userfaultfd_k.h |   36 -
 mm/userfaultfd.c              | 2239 ++++++++++++++++++++++++++++++++-
 5 files changed, 2227 insertions(+), 2283 deletions(-)
 delete mode 100644 fs/userfaultfd.c


base-commit: 7f077167feb6e403ef039d6009d785d596ed8070
-- 
2.53.0