The patch titled Subject: thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix has been added to the -mm tree. Its filename is thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx> 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@xxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: "Bruggeman, Otto G" <otto.g.bruggeman@xxxxxxxxx> Cc: "Aneesh Kumar K . V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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@xxxxxxxxxxxxx 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 thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment-fix.patch