[folded-merged] hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix.patch removed from -mm tree

[folded-merged] hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix
has been removed from the -mm tree.  Its filename was
     hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix.patch

This patch was dropped because it was folded into hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share.patch

------------------------------------------------------
From: Peter Xu <peterx@redhat.com>
Subject: hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix

build fix

Link: https://lkml.kernel.org/r/20210304164653.GB397383@xz-x1

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/hugetlb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/hugetlb.c~hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix
+++ a/mm/hugetlb.c
@@ -5450,7 +5450,7 @@ int huge_pmd_unshare(struct mm_struct *m
 }
 #define want_pmd_share()	(1)
 #else /* !CONFIG_ARCH_WANT_HUGE_PMD_SHARE */
-pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct vma,
+pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,
 		      unsigned long addr, pud_t *pud)
 {
 	return NULL;
_

Patches currently in -mm which might be from peterx@redhat.com are

hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share.patch
hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled.patch
hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled-fix.patch
mm-hugetlb-move-flush_hugetlb_tlb_range-into-hugetlbh.patch
hugetlb-userfaultfd-unshare-all-pmds-for-hugetlbfs-when-register-wp.patch
userfaultfd-add-minor-fault-registration-mode-fix.patch
mm-hugetlb-fix-f_seal_future_write.patch
mm-hugetlb-fix-cow-where-page-writtable-in-child.patch