The quilt patch titled
Subject: mm/memory.c: fix mismerge
has been removed from the -mm tree. Its filename was
mm-memoryc-fix-mismerge.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Subject: mm/memory.c: fix mismerge
Date: Sat, 12 Aug 2023 16:56:25 +0100
Fix a build issue.
Link: https://lkml.kernel.org/r/ZNerqcNS4EBJA/2v@xxxxxxxxxxxxxxxxxxxx
Fixes: 4aaa60dad4d1 ("mm: allow per-VMA locks on file-backed VMAs")
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202308121909.XNYBtqNI-lkp@xxxxxxxxx/
Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/memory.c~mm-memoryc-fix-mismerge
+++ a/mm/memory.c
@@ -5457,7 +5457,7 @@ retry:
* concurrent mremap() with MREMAP_DONTUNMAP could dissociate the VMA
* from its anon_vma.
*/
- if (unlikely(!vma->anon_vma && !vma_is_tcp(vma)))
+ if (vma_is_anonymous(vma) && !vma->anon_vma)
goto inval_end_read;
/*
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
