chore(hiding_ci): fix up guest_memfd UFFD patches

resources/hiding_ci/linux_patches/0001-mm-Consolidate-freeing-of-typed-folios-on-final-foli.patch

@@ -1,7 +1,7 @@
 From f9ca710b51263ce8317cc2fa02232e456fa1f39c Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:15 +0000
-Subject: [PATCH 01/34] mm: Consolidate freeing of typed folios on final
+Subject: [PATCH 01/26] mm: Consolidate freeing of typed folios on final
  folio_put()
 
 Some folio types, such as hugetlb, handle freeing their own

resources/hiding_ci/linux_patches/0002-KVM-guest_memfd-Handle-final-folio_put-of-guest_memf.patch

@@ -1,7 +1,7 @@
 From 9a4d7cd855d14e1522f363e3e04ebb9fa0a90ff0 Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:16 +0000
-Subject: [PATCH 02/34] KVM: guest_memfd: Handle final folio_put() of
+Subject: [PATCH 02/26] KVM: guest_memfd: Handle final folio_put() of
  guest_memfd pages
 
 Before transitioning a guest_memfd folio to unshared, thereby

resources/hiding_ci/linux_patches/0003-KVM-guest_memfd-Allow-host-to-map-guest_memfd-pages.patch

@@ -1,7 +1,7 @@
 From fd39febef2e0d41394e51f5e34f2c8de80b3b4dc Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:17 +0000
-Subject: [PATCH 03/34] KVM: guest_memfd: Allow host to map guest_memfd() pages
+Subject: [PATCH 03/26] KVM: guest_memfd: Allow host to map guest_memfd() pages
 
 Add support for mmap() and fault() for guest_memfd backed memory
 in the host for VMs that support in-place conversion between

resources/hiding_ci/linux_patches/0004-KVM-x86-Mark-KVM_X86_SW_PROTECTED_VM-as-supporting-g.patch

@@ -1,7 +1,7 @@
 From d16c343f0f95ecd8d2cda2dfba4ac8b7c293f217 Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:19 +0000
-Subject: [PATCH 04/34] KVM: x86: Mark KVM_X86_SW_PROTECTED_VM as supporting
+Subject: [PATCH 04/26] KVM: x86: Mark KVM_X86_SW_PROTECTED_VM as supporting
  guest_memfd shared memory
 
 The KVM_X86_SW_PROTECTED_VM type is meant for experimentation and

resources/hiding_ci/linux_patches/0005-KVM-arm64-Refactor-user_mem_abort-calculation-of-for.patch

@@ -1,7 +1,7 @@
 From 483ccb70335cb0c76161caf76c0ccb7c618038e2 Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:20 +0000
-Subject: [PATCH 05/34] KVM: arm64: Refactor user_mem_abort() calculation of
+Subject: [PATCH 05/26] KVM: arm64: Refactor user_mem_abort() calculation of
  force_pte
 
 To simplify the code and to make the assumptions clearer,

resources/hiding_ci/linux_patches/0006-KVM-guest_memfd-Handle-in-place-shared-memory-as-gue.patch

@@ -1,7 +1,7 @@
 From b1e925d4d5db8513dba67c3a9d40a2b507668f09 Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:18 +0000
-Subject: [PATCH 06/34] KVM: guest_memfd: Handle in-place shared memory as
+Subject: [PATCH 06/26] KVM: guest_memfd: Handle in-place shared memory as
  guest_memfd backed memory
 
 For VMs that allow sharing guest_memfd backed memory in-place,

resources/hiding_ci/linux_patches/0007-KVM-arm64-Handle-guest_memfd-backed-guest-page-fault.patch

@@ -1,7 +1,7 @@
 From 996513a423377349767d5cfef87850e80131854f Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:21 +0000
-Subject: [PATCH 07/34] KVM: arm64: Handle guest_memfd()-backed guest page
+Subject: [PATCH 07/26] KVM: arm64: Handle guest_memfd()-backed guest page
  faults
 
 Add arm64 support for handling guest page faults on guest_memfd

resources/hiding_ci/linux_patches/0008-KVM-guest_memfd-selftests-guest_memfd-mmap-test-when.patch

@@ -1,7 +1,7 @@
 From 1ee5d01987bff47f007fb86ad7738b299816b2ef Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:23 +0000
-Subject: [PATCH 08/34] KVM: guest_memfd: selftests: guest_memfd mmap() test
+Subject: [PATCH 08/26] KVM: guest_memfd: selftests: guest_memfd mmap() test
  when mapping is allowed
 
 Expand the guest_memfd selftests to include testing mapping guest

resources/hiding_ci/linux_patches/0009-KVM-arm64-Enable-mapping-guest_memfd-in-arm64.patch

@@ -1,7 +1,7 @@
 From 3cc51efc17a2c41a480eed36b31c1773936717e0 Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
 Date: Tue, 18 Mar 2025 16:18:22 +0000
-Subject: [PATCH 09/34] KVM: arm64: Enable mapping guest_memfd in arm64
+Subject: [PATCH 09/26] KVM: arm64: Enable mapping guest_memfd in arm64
 
 Enable mapping guest_memfd in arm64. For now, it applies to all
 VMs in arm64 that use guest_memfd. In the future, new VM types

resources/hiding_ci/linux_patches/0010-mm-introduce-AS_NO_DIRECT_MAP.patch

@@ -1,7 +1,7 @@
 From 22ec89c0ff7af3430027cf71cf8bce5c8ed6e402 Mon Sep 17 00:00:00 2001
 From: Patrick Roy <[email protected]>
 Date: Fri, 7 Feb 2025 11:16:06 +0000
-Subject: [PATCH 10/34] mm: introduce AS_NO_DIRECT_MAP
+Subject: [PATCH 10/26] mm: introduce AS_NO_DIRECT_MAP
 
 Add AS_NO_DIRECT_MAP for mappings where direct map entries of folios are
 set to not present . Currently, mappings that match this description are

resources/hiding_ci/linux_patches/0011-KVM-guest_memfd-Add-flag-to-remove-from-direct-map.patch

@@ -1,7 +1,7 @@
 From b1fc478976c93fd42b14e06d2de57e121be03142 Mon Sep 17 00:00:00 2001
 From: Patrick Roy <[email protected]>
 Date: Fri, 7 Feb 2025 14:33:01 +0000
-Subject: [PATCH 11/34] KVM: guest_memfd: Add flag to remove from direct map
+Subject: [PATCH 11/26] KVM: guest_memfd: Add flag to remove from direct map
 
 Add KVM_GMEM_NO_DIRECT_MAP flag for KVM_CREATE_GUEST_MEMFD() ioctl. When
 set, guest_memfd folios will be removed from the direct map after

resources/hiding_ci/linux_patches/0012-patrick-v4-fixup.patch → resources/hiding_ci/linux_patches/0012-fixup-for-direct-map-removal-v4.patch

@@ -1,7 +1,7 @@
-From 098a8167ad6c55336cad9abb808ebdc105784278 Mon Sep 17 00:00:00 2001
+From ab44b2d5bfb7ef9b7bbb156d493f49a4bbebf014 Mon Sep 17 00:00:00 2001
 From: Nikita Kalyazin <[email protected]>
 Date: Thu, 10 Apr 2025 14:18:39 +0000
-Subject: [PATCH 12/34] patrick v4 fixup
+Subject: [PATCH 12/26] fixup for direct map removal v4
 
 Do not make kvm_gmem_free_folio dependent on
 CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE .

resources/hiding_ci/linux_patches/0013-KVM-Add-KVM_MEM_USERFAULT-memslot-flag-and-bitmap.patch

@@ -1,7 +1,7 @@
-From abfa51cb95feaae899254453788c6db1c70d0189 Mon Sep 17 00:00:00 2001
+From 48a178e27031d5eac97ba0630686fcf3034e88ed Mon Sep 17 00:00:00 2001
 From: James Houghton <[email protected]>
 Date: Thu, 9 Jan 2025 20:49:17 +0000
-Subject: [PATCH 13/34] KVM: Add KVM_MEM_USERFAULT memslot flag and bitmap
+Subject: [PATCH 13/26] KVM: Add KVM_MEM_USERFAULT memslot flag and bitmap
 
 Use one of the 14 reserved u64s in struct kvm_userspace_memory_region2
 for the user to provide `userfault_bitmap`.

resources/hiding_ci/linux_patches/0014-KVM-Add-KVM_MEMORY_EXIT_FLAG_USERFAULT.patch

@@ -1,7 +1,7 @@
-From 0a91075ecff4f60404bc05da0d10d41e1b33fcec Mon Sep 17 00:00:00 2001
+From 51a78015a0114ceaf1930739bba6111b1bc09f87 Mon Sep 17 00:00:00 2001
 From: James Houghton <[email protected]>
 Date: Thu, 9 Jan 2025 20:49:18 +0000
-Subject: [PATCH 14/34] KVM: Add KVM_MEMORY_EXIT_FLAG_USERFAULT
+Subject: [PATCH 14/26] KVM: Add KVM_MEMORY_EXIT_FLAG_USERFAULT
 
 This flag is used for vCPU memory faults caused by KVM Userfault; i.e.,
 the bit in `userfault_bitmap` corresponding to the faulting gfn was set.

resources/hiding_ci/linux_patches/0015-KVM-Allow-late-setting-of-KVM_MEM_USERFAULT-on-guest.patch

@@ -1,7 +1,7 @@
-From 7a626f99566e7ab7fce004fcf4041d87e75512cc Mon Sep 17 00:00:00 2001
+From ed691412fd9414d3b9124e2416f6cae3f21a1071 Mon Sep 17 00:00:00 2001
 From: James Houghton <[email protected]>
 Date: Thu, 9 Jan 2025 20:49:19 +0000
-Subject: [PATCH 15/34] KVM: Allow late setting of KVM_MEM_USERFAULT on
+Subject: [PATCH 15/26] KVM: Allow late setting of KVM_MEM_USERFAULT on
  guest_memfd memslot
 
 Currently guest_memfd memslots can only be deleted. Slightly change the

resources/hiding_ci/linux_patches/0016-KVM-x86-mmu-Add-support-for-KVM_MEM_USERFAULT.patch

@@ -1,7 +1,7 @@
-From 7e9f22f83ca191df8deab84d7c8c9d64a1b5b10f Mon Sep 17 00:00:00 2001
+From fa324f2e503cd36dc357c3eb9b807e02f9b6206e Mon Sep 17 00:00:00 2001
 From: James Houghton <[email protected]>
 Date: Thu, 9 Jan 2025 20:49:21 +0000
-Subject: [PATCH 16/34] KVM: x86/mmu: Add support for KVM_MEM_USERFAULT
+Subject: [PATCH 16/26] KVM: x86/mmu: Add support for KVM_MEM_USERFAULT
 
 Adhering to the requirements of KVM Userfault:
 

resources/hiding_ci/linux_patches/0017-KVM-Advertise-KVM_CAP_USERFAULT-in-KVM_CHECK_EXTENSI.patch

@@ -1,7 +1,7 @@
-From fe6a44733d6384057fd68732ebf3aeb612443d14 Mon Sep 17 00:00:00 2001
+From f0ef961eba32b98755d2bfa5ff684944e3a442fc Mon Sep 17 00:00:00 2001
 From: James Houghton <[email protected]>
 Date: Thu, 9 Jan 2025 20:49:20 +0000
-Subject: [PATCH 17/34] KVM: Advertise KVM_CAP_USERFAULT in KVM_CHECK_EXTENSION
+Subject: [PATCH 17/26] KVM: Advertise KVM_CAP_USERFAULT in KVM_CHECK_EXTENSION
 
 Advertise support for KVM_CAP_USERFAULT when kvm_has_userfault() returns
 true. Currently this is merely IS_ENABLED(CONFIG_HAVE_KVM_USERFAULT), so

resources/hiding_ci/linux_patches/0018-KVM-arm64-Add-support-for-KVM_MEM_USERFAULT.patch

@@ -1,7 +1,7 @@
-From 86888e840dce0193dfb14916857df1c09749b618 Mon Sep 17 00:00:00 2001
+From 482a64008a53577da046428922f247dce203113f Mon Sep 17 00:00:00 2001
 From: James Houghton <[email protected]>
 Date: Thu, 9 Jan 2025 20:49:22 +0000
-Subject: [PATCH 18/34] KVM: arm64: Add support for KVM_MEM_USERFAULT
+Subject: [PATCH 18/26] KVM: arm64: Add support for KVM_MEM_USERFAULT
 
 Adhering to the requirements of KVM Userfault:
 1. When it is toggled on, zap the second stage with

resources/hiding_ci/linux_patches/0026-KVM-guest_memfd-add-generic-population-via-write.patch → resources/hiding_ci/linux_patches/0019-KVM-guest_memfd-add-generic-population-via-write.patch

@@ -1,7 +1,7 @@
-From dda48e07b48f344c57d8ed90ddad7e01c26f7952 Mon Sep 17 00:00:00 2001
+From f81fae83d40e1520a0a46afa3473f9fc4c6b7c79 Mon Sep 17 00:00:00 2001
 From: Nikita Kalyazin <[email protected]>
 Date: Fri, 29 Nov 2024 11:51:02 +0000
-Subject: [PATCH 26/34] KVM: guest_memfd: add generic population via write
+Subject: [PATCH 19/26] KVM: guest_memfd: add generic population via write
 
 write syscall populates guest_memfd with user-supplied data in a generic
 way, ie no vendor-specific preparation is performed.  This is supposed

resources/hiding_ci/linux_patches/0027-KVM-selftests-update-guest_memfd-write-tests.patch → resources/hiding_ci/linux_patches/0020-KVM-selftests-update-guest_memfd-write-tests.patch

@@ -1,7 +1,7 @@
-From 120635067e2d910bf96a53e3b7e2f2d5be19af7e Mon Sep 17 00:00:00 2001
+From 3ccb28e0fe31afa8ac626ebd5b957ba9263a68d3 Mon Sep 17 00:00:00 2001
 From: Nikita Kalyazin <[email protected]>
 Date: Fri, 29 Nov 2024 11:57:58 +0000
-Subject: [PATCH 27/34] KVM: selftests: update guest_memfd write tests
+Subject: [PATCH 20/26] KVM: selftests: update guest_memfd write tests
 
 This is to reflect that the write syscall is now implemented for
 guest_memfd.

resources/hiding_ci/linux_patches/0028-mm-userfaultfd-generic-continue-for-non-hugetlbfs.patch → resources/hiding_ci/linux_patches/0021-mm-userfaultfd-generic-continue-for-non-hugetlbfs.patch

@@ -1,7 +1,7 @@
-From 38fb84551a238b98a622433157fb2537ecb5611e Mon Sep 17 00:00:00 2001
+From 51dc7d27476d00d96f6f71882a11b5e17e80aa8f Mon Sep 17 00:00:00 2001
 From: Nikita Kalyazin <[email protected]>
 Date: Mon, 31 Mar 2025 10:15:35 +0000
-Subject: [PATCH 28/34] mm: userfaultfd: generic continue for non hugetlbfs
+Subject: [PATCH 21/26] mm: userfaultfd: generic continue for non hugetlbfs
 
 Remove shmem-specific code from UFFDIO_CONTINUE implementation for
 non-huge pages by calling vm_ops->fault().  A new VMF flag,

resources/hiding_ci/linux_patches/0029-mm-provide-can_userfault-vma-operation.patch → resources/hiding_ci/linux_patches/0022-mm-provide-can_userfault-vma-operation.patch

@@ -1,7 +1,7 @@
-From bcfff7f58b747aac6f27a51ce54efe5eae4b02f9 Mon Sep 17 00:00:00 2001
+From 7ed09f6e50ea4e4448e457a7b7712bdf3b38e826 Mon Sep 17 00:00:00 2001
 From: Nikita Kalyazin <[email protected]>
 Date: Fri, 4 Apr 2025 14:15:18 +0000
-Subject: [PATCH 29/34] mm: provide can_userfault vma operation
+Subject: [PATCH 22/26] mm: provide can_userfault vma operation
 
 The new operation allows to decouple the userfaulfd code from
 dependencies to VMA types, specifically, shmem and hugetlb.  The