Skip to contentSkip to conversation

init-simplify-initramfso-build-rule.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Oct 11

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: init: simplify initramfs.o build rule
has been removed from the -mm tree. Its filename was
init-simplify-initramfso-build-rule.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yuntao Wang <[email protected]>
Subject: init: simplify initramfs.o build rule
Date: Wed, 30 Sep 2026 09:57:48 +0800

CONFIG_BLK_DEV_INITRD is known to be enabled in the else branch, so there is no need to use obj-$(CONFIG_BLK_DEV_INITRD). Use obj-y directly to make the build rule clearer.

Also, reorder the condition to make the code easier to follow.

No functional change.

---

 init/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
init/Makefile renamed from init/Makefile~init-simplify-initramfso-build-rule +3 -3
@@ -6,10 +6,10 @@
 ccflags-y := -fno-function-sections -fno-data-sections
 
 obj-y                          := main.o version.o mounts.o
-ifneq ($(CONFIG_BLK_DEV_INITRD),y)
-obj-y                          += noinitramfs.o
+ifeq ($(CONFIG_BLK_DEV_INITRD),y)
+obj-y                          += initramfs.o
 else
-obj-$(CONFIG_BLK_DEV_INITRD)   += initramfs.o
+obj-y                          += noinitramfs.o
 endif
 obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
 obj-$(CONFIG_INITRAMFS_TEST)   += initramfs_test.o

_

Patches currently in -mm which might be from [email protected] are

dyndbg-fix-incorrect-mod_ct-value-in-dynamic_debug_init.patch dyndbg-clean-up-dynamic_debug_init-to-improve-readability.patch