From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
	Christian Brauner <brauner@kernel.org>,
	David Hildenbrand <david@kernel.org>, Jan Kara <jack@suse.cz>,
	Kiryl Shutsemau <kirill@shutemov.name>,
	Mike Rapoport <rppt@kernel.org>, Peter Xu <peterx@redhat.com>,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org
Subject: [PATCH v3 0/2] userfaultfd: merge fs/userfaultfd.c into mm/userfaultfd.c
Date: Sat, 23 May 2026 20:37:57 +0300	[thread overview]
Message-ID: <20260523173759.3964908-1-rppt@kernel.org> (raw)

From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>

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@kernel.org
* add a fix for pre-existing bug found by sashiko as a separate patch

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

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


             reply	other threads:[~2026-05-23 17:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-23 17:37 Mike Rapoport [this message]
2026-05-23 17:37 ` [PATCH v3 1/2] userfaultfd: merge fs/userfaultfd.c into mm/userfaultfd.c Mike Rapoport
2026-05-23 17:37 ` [PATCH v3 2/2] userfaultfd: make functions that are not used outside uffd static Mike Rapoport
2026-05-28 12:39 ` [PATCH v3 0/2] userfaultfd: merge fs/userfaultfd.c into mm/userfaultfd.c Christian Brauner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260523173759.3964908-1-rppt@kernel.org \
    --to=rppt@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=brauner@kernel.org \
    --cc=david@kernel.org \
    --cc=jack@suse.cz \
    --cc=kirill@shutemov.name \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=peterx@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.