From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53042186E for ; Wed, 13 Dec 2023 01:20:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="hk8pK6ji" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CFF6C433C7; Wed, 13 Dec 2023 01:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1702430449; bh=buJYpedwA+OkXvdAwqsIf6wwPukRg98Ce9OSoLV9lB4=; h=Date:To:From:Subject:From; b=hk8pK6jimsMZV3fZZYRZkm9ls5TXHlWoxAxdKjE8jf3wYPEjr51wmi63Da2TkB+yZ 0YTK++f28OZ9n6sy+EjJ1mLWwChuAL9NGG2C86okiJOYJjhK3HHTV298512wlse7Ea 9jgUWgCX4w12CCgXXpSQfXW4EDNQHSTTHTWPBtJA= Date: Tue, 12 Dec 2023 17:20:48 -0800 To: mm-commits@vger.kernel.org,sfr@canb.auug.org.au,lkp@intel.com,ignat@cloudflare.com,eric_devolder@yahoo.com,bhe@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] m68k-kexec-fix-the-incorrect-ifdeffery-and-build-dependency-of-config_kexec.patch removed from -mm tree Message-Id: <20231213012049.1CFF6C433C7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: m68k, kexec: fix the incorrect ifdeffery and build dependency of CONFIG_KEXEC has been removed from the -mm tree. Its filename was m68k-kexec-fix-the-incorrect-ifdeffery-and-build-dependency-of-config_kexec.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Baoquan He Subject: m68k, kexec: fix the incorrect ifdeffery and build dependency of CONFIG_KEXEC Date: Fri, 8 Dec 2023 15:30:33 +0800 The select of KEXEC for CRASH_DUMP in kernel/Kconfig.kexec will be dropped, then compiling errors will be triggered if below config items are set: === CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y CONFIG_CRASH_DUMP=y === Here, change the dependency of buinding machine_kexec.o relocate_kernel.o and the ifdeffery in asm/kexe.h to CONFIG_KEXEC_CORE. Link: https://lkml.kernel.org/r/20231208073036.7884-3-bhe@redhat.com Signed-off-by: Baoquan He Cc: Eric DeVolder Cc: Ignat Korchagin Cc: kernel test robot Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- arch/m68k/include/asm/kexec.h | 4 ++-- arch/m68k/kernel/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/arch/m68k/include/asm/kexec.h~m68k-kexec-fix-the-incorrect-ifdeffery-and-build-dependency-of-config_kexec +++ a/arch/m68k/include/asm/kexec.h @@ -2,7 +2,7 @@ #ifndef _ASM_M68K_KEXEC_H #define _ASM_M68K_KEXEC_H -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE /* Maximum physical address we can use pages from */ #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL) @@ -25,6 +25,6 @@ static inline void crash_setup_regs(stru #endif /* __ASSEMBLY__ */ -#endif /* CONFIG_KEXEC */ +#endif /* CONFIG_KEXEC_CORE */ #endif /* _ASM_M68K_KEXEC_H */ --- a/arch/m68k/kernel/Makefile~m68k-kexec-fix-the-incorrect-ifdeffery-and-build-dependency-of-config_kexec +++ a/arch/m68k/kernel/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_PCI) += pcibios.o obj-$(CONFIG_M68K_NONCOHERENT_DMA) += dma.o -obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o +obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_BOOTINFO_PROC) += bootinfo_proc.o obj-$(CONFIG_UBOOT) += uboot.o _ Patches currently in -mm which might be from bhe@redhat.com are kexec_file-add-kexec_file-flag-to-control-debug-printing.patch kexec_file-print-out-debugging-message-if-required.patch kexec_file-x86-print-out-debugging-message-if-required.patch kexec_file-arm64-print-out-debugging-message-if-required.patch kexec_file-ricv-print-out-debugging-message-if-required.patch kexec_file-power-print-out-debugging-message-if-required.patch kexec_file-parisc-print-out-debugging-message-if-required.patch riscv-kexec-fix-the-ifdeffery-for-aflags_kexec_relocateo.patch