[folded-merged] userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch removed from -mm tree

[folded-merged] userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: userfaultfd: hugetlbfs: unmap the correct pointer
has been removed from the -mm tree.  Its filename was
     userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch

This patch was dropped because it was folded into userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing.patch

------------------------------------------------------
From: Dan Carpenter <dan.carpenter@oracle.com>
Subject: userfaultfd: hugetlbfs: unmap the correct pointer

kunmap_atomic() and kunmap() take different pointers.  People often get
these mixed up.

Fixes: 16374db2e9a0 ("userfaultfd: hugetlbfs: fix __mcopy_atomic_hugetlb retry/error processing")
Link: http://lkml.kernel.org/r/20170113082608.GA3548@mwanda
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN mm/memory.c~userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix mm/memory.c
--- a/mm/memory.c~userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix
+++ a/mm/memory.c
@@ -4172,7 +4172,7 @@ long copy_huge_page_from_user(struct pag
 				(const void __user *)(src + i * PAGE_SIZE),
 				PAGE_SIZE);
 		if (allow_pagefault)
-			kunmap(page_kaddr);
+			kunmap(page_kaddr + i);
 		else
 			kunmap_atomic(page_kaddr);
 
_

Patches currently in -mm which might be from dan.carpenter@oracle.com are

userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing.patch