Skip to contentSkip to conversation

mm-rename-balloon_compactionch-to-balloonch.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 31

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: rename balloon_compaction.(c|h) to balloon.(c|h)
has been removed from the -mm tree. Its filename was
mm-rename-balloon_compactionch-to-balloonch.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: "David Hildenbrand (Red Hat)" <[email protected]>
Subject: mm: rename balloon_compaction.(c|h) to balloon.(c|h)
Date: Tue, 20 Jan 2026 00:01:28 +0100

Even without CONFIG_BALLOON_COMPACTION this infrastructure implements basic list and page management for a memory balloon.

Cc Arnd Bergmann <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Eugenio Pérez <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jason Wang <[email protected]>
Cc Jerrin Shaji George <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc SeongJae Park <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Xuan Zhuo <[email protected]>
Cc Zi Yan <[email protected]>

---

 Documentation/core-api/mm-api.rst    |    2 
 MAINTAINERS                          |    4 
 arch/powerpc/platforms/pseries/cmm.c |    2 
 drivers/misc/vmw_balloon.c           |    2 
 drivers/virtio/virtio_balloon.c      |    2 
 include/linux/balloon.h              |   77 +++++
 include/linux/balloon_compaction.h   |   78 -----
 mm/Makefile                          |    2 
 mm/balloon.c                         |  344 ++++++++++++++++++++++++
 mm/balloon_compaction.c              |  345 -------------------------
 10 files changed, 428 insertions(+), 430 deletions(-)
arch/powerpc/platforms/pseries/cmm.c renamed from arch/powerpc/platforms/pseries/cmm.c~mm-rename-balloon_compactionch-to-balloonch +1 -1
@@ -19,7 +19,7 @@
 #include <linux/stringify.h>
 #include <linux/swap.h>
 #include <linux/device.h>
-#include <linux/balloon_compaction.h>
+#include <linux/balloon.h>
 #include <asm/firmware.h>
 #include <asm/hvcall.h>
 #include <asm/mmu.h>
Documentation/core-api/mm-api.rst renamed from Documentation/core-api/mm-api.rst~mm-rename-balloon_compactionch-to-balloonch +1 -1
@@ -130,5 +130,5 @@ More Memory Management Functions
 .. kernel-doc:: mm/vmscan.c
 .. kernel-doc:: mm/memory_hotplug.c
 .. kernel-doc:: mm/mmu_notifier.c
-.. kernel-doc:: mm/balloon_compaction.c
+.. kernel-doc:: mm/balloon.c
 .. kernel-doc:: mm/huge_memory.c
drivers/misc/vmw_balloon.c renamed from drivers/misc/vmw_balloon.c~mm-rename-balloon_compactionch-to-balloonch +1 -1
@@ -29,7 +29,7 @@
 #include <linux/rwsem.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <linux/balloon_compaction.h>
+#include <linux/balloon.h>
 #include <linux/vmw_vmci_defs.h>
 #include <linux/vmw_vmci_api.h>
 #include <asm/hypervisor.h>
drivers/virtio/virtio_balloon.c renamed from drivers/virtio/virtio_balloon.c~mm-rename-balloon_compactionch-to-balloonch +1 -1
@@ -13,7 +13,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/balloon_compaction.h>
+#include <linux/balloon.h>
 #include <linux/oom.h>
 #include <linux/wait.h>
 #include <linux/mm.h>
include/linux/balloon_compaction.h deleted +0 -78

78 lines not on this page · raw message

include/linux/balloon.h new file +77 -0

77 lines not on this page · raw message

MAINTAINERS renamed from MAINTAINERS~mm-rename-balloon_compactionch-to-balloonch +2 -2
@@ -27546,9 +27546,9 @@ M:	David Hildenbrand <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/virtio/virtio_balloon.c
-F:	include/linux/balloon_compaction.h
+F:	include/linux/balloon.h
 F:	include/uapi/linux/virtio_balloon.h
-F:	mm/balloon_compaction.c
+F:	mm/balloon.c
 
 VIRTIO BLOCK AND SCSI DRIVERS
 M:	"Michael S. Tsirkin" <[email protected]>
mm/balloon.c new file +344 -0

344 lines not on this page · raw message

mm/balloon_compaction.c deleted +0 -345

345 lines not on this page · raw message

mm/Makefile renamed from mm/Makefile~mm-rename-balloon_compactionch-to-balloonch +1 -1
@@ -122,7 +122,7 @@ obj-$(CONFIG_CMA)	+= cma.o
 obj-$(CONFIG_NUMA) += numa.o
 obj-$(CONFIG_NUMA_MEMBLKS) += numa_memblks.o
 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
-obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
+obj-$(CONFIG_MEMORY_BALLOON) += balloon.o
 obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
 obj-$(CONFIG_PAGE_TABLE_CHECK) += page_table_check.o
 obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o

_

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

mm-move-pte-table-reclaim-code-to-memoryc.patch mm-memory-handle-non-split-locks-correctly-in-zap_empty_pte_table.patch