* [folded-merged] thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch removed from -mm tree
@ 2020-01-14 0:21 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2020-01-14 0:21 UTC (permalink / raw)
To: mm-commits, thomas.willhalm, otto.g.bruggeman, dan.j.williams,
aneesh.kumar, kirill
The patch titled
Subject: thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix
has been removed from the -mm tree. Its filename was
thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch
This patch was dropped because it was folded into thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment.patch
------------------------------------------------------
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Subject: thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix
Ouch, I forgot to fold in a fixup:
Link: http://lkml.kernel.org/r/20191223231309.t6bh5hkbmokihpfu@box
Cc: "Willhalm, Thomas" <thomas.willhalm@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: "Bruggeman, Otto G" <otto.g.bruggeman@intel.com>
Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/shmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/shmem.c~thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix
+++ a/mm/shmem.c
@@ -2144,7 +2144,7 @@ unsigned long shmem_get_unmapped_area(st
if (inflated_len < len)
return addr;
- inflated_addr = get_area(uaddr, 0, inflated_len, 0, flags);
+ inflated_addr = get_area(NULL, uaddr, inflated_len, 0, flags);
if (IS_ERR_VALUE(inflated_addr))
return addr;
if (inflated_addr & ~PAGE_MASK)
_
Patches currently in -mm which might be from kirill@shutemov.name are
thp-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment.patch
thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment.patch
mm-page_alloc-skip-non-present-sections-on-zone-initialization.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-14 0:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-14 0:21 [folded-merged] thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).