[merged mm-stable] arm-pgtable-remove-duplicate-included-header-file.patch removed from -mm tree

[merged mm-stable] arm-pgtable-remove-duplicate-included-header-file.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: arm/pgtable: remove duplicate included header file
has been removed from the -mm tree.  Its filename was
     arm-pgtable-remove-duplicate-included-header-file.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: Thorsten Blum <thorsten.blum@linux.dev>
Subject: arm/pgtable: remove duplicate included header file
Date: Wed, 19 Feb 2025 12:24:02 +0100

The header file asm-generic/pgtable-nopud.h is included whether CONFIG_MMU
is defined or not.

Include it only once before the #ifndef/#else/#endif preprocessor
directives and remove the following make includecheck warning:

  asm-generic/pgtable-nopud.h is included more than once

Link: https://lkml.kernel.org/r/20250219112403.3959-2-thorsten.blum@linux.dev
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/include/asm/pgtable.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/arch/arm/include/asm/pgtable.h~arm-pgtable-remove-duplicate-included-header-file
+++ a/arch/arm/include/asm/pgtable.h
@@ -19,14 +19,13 @@ extern struct page *empty_zero_page;
 #define ZERO_PAGE(vaddr)	(empty_zero_page)
 #endif
 
-#ifndef CONFIG_MMU
-
 #include <asm-generic/pgtable-nopud.h>
+
+#ifndef CONFIG_MMU
 #include <asm/pgtable-nommu.h>
 
 #else
 
-#include <asm-generic/pgtable-nopud.h>
 #include <asm/page.h>
 #include <asm/pgtable-hwdef.h>
 
_

Patches currently in -mm which might be from thorsten.blum@linux.dev are

watchdog-perf-optimize-bytes-copied-and-remove-manual-nul-termination.patch