[alternative-merged] mmshmem-fix-a-typo-in-shmem_swapin_page.patch removed from -mm tree

[alternative-merged] mmshmem-fix-a-typo-in-shmem_swapin_page.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm,shmem: fix a typo in shmem_swapin_page()
has been removed from the -mm tree.  Its filename was
     mmshmem-fix-a-typo-in-shmem_swapin_page.patch

This patch was dropped because an alternative patch was merged

------------------------------------------------------
From: Huang Ying <ying.huang@intel.com>
Subject: mm,shmem: fix a typo in shmem_swapin_page()

"-" is missing before "EINVAL".

Link: https://lkml.kernel.org/r/20210723080000.93953-1-ying.huang@intel.com
Fixes: 2efa33fc7f6e ("mm/shmem: fix shmem_swapin() race with swapoff")
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/shmem.c~mmshmem-fix-a-typo-in-shmem_swapin_page
+++ a/mm/shmem.c
@@ -1708,7 +1708,7 @@ static int shmem_swapin_page(struct inod
 	/* Prevent swapoff from happening to us. */
 	si = get_swap_device(swap);
 	if (!si) {
-		error = EINVAL;
+		error = -EINVAL;
 		goto failed;
 	}
 	/* Look it up and read it in.. */
_

Patches currently in -mm which might be from ying.huang@intel.com are

mmdo_huge_pmd_numa_page-remove-unnecessary-tlb-flushing-code.patch
mm-migrate-add-sysfs-interface-to-enable-reclaim-migration.patch