The patch titled
Subject: m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix
has been added to the -mm tree. Its filename is
m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix
fix merge glitch
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/m68k/mm/kmap.c | 1 -
1 file changed, 1 deletion(-)
--- a/arch/m68k/mm/kmap.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix
+++ a/arch/m68k/mm/kmap.c
@@ -345,7 +345,6 @@ void kernel_set_cachemode(void *addr, un
cmode = 0;
}
}
-#endif
while ((long)size > 0) {
pgd_dir = pgd_offset_k(virtaddr);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-swap-disallow-swapon-on-zoned-block-devices-fix.patch
rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix.patch
mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch
memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings-fix.patch
mm-sparse-do-not-waste-pre-allocated-memmap-space-fix.patch
mm-vmscan-simplify-lruvec_lru_size-fix-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch
mm-madvise-replace-with-page_size-in-madvise_inject_error-fix.patch
mm-annotate-refault-stalls-from-swap_readpage-fix.patch
lib-optimize-cpumask_local_spread-v3-fix.patch
usb-kcov-collect-coverage-from-hub_event-fix.patch
linux-next-rejects.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch
m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
