The patch titled
Subject: resource-merge-resources-on-a-node-when-hot-adding-memory-fix
has been added to the -mm tree. Its filename is
resource-merge-resources-on-a-node-when-hot-adding-memory-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/resource-merge-resources-on-a-node-when-hot-adding-memory-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/resource-merge-resources-on-a-node-when-hot-adding-memory-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: resource-merge-resources-on-a-node-when-hot-adding-memory-fix
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN drivers/xen/balloon.c~resource-merge-resources-on-a-node-when-hot-adding-memory-fix drivers/xen/balloon.c
diff -puN include/linux/ioport.h~resource-merge-resources-on-a-node-when-hot-adding-memory-fix include/linux/ioport.h
diff -puN include/linux/memory_hotplug.h~resource-merge-resources-on-a-node-when-hot-adding-memory-fix include/linux/memory_hotplug.h
diff -puN kernel/resource.c~resource-merge-resources-on-a-node-when-hot-adding-memory-fix kernel/resource.c
--- a/kernel/resource.c~resource-merge-resources-on-a-node-when-hot-adding-memory-fix
+++ a/kernel/resource.c
@@ -1625,7 +1625,7 @@ __setup("iomem=", strict_iomem);
#ifdef CONFIG_MEMORY_HOTPLUG
#ifdef CONFIG_MEMORY_HOTREMOVE
/*
- * Attempt to merge resource and it's sibling
+ * Attempt to merge resource and its sibling
*/
static int merge_resources(struct resource *res)
{
diff -puN mm/memory_hotplug.c~resource-merge-resources-on-a-node-when-hot-adding-memory-fix mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~resource-merge-resources-on-a-node-when-hot-adding-memory-fix
+++ a/mm/memory_hotplug.c
@@ -1116,7 +1116,7 @@ static int online_memory_block(struct me
}
/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
-int __ref add_memory_resource(int nid, struct resource *res, bool online)
+int __ref add_memory_resource(int nid, u64 start, u64 size, bool online)
{
bool new_node = false;
int ret;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
zram-remove-bd_cap_synchronous_io-with-writeback-feature-v2-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
mm.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes.patch
mm-drop-vm_bug_on-from-__get_free_pages-fix.patch
mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch
mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch
mm-sparse-abstract-sparse-buffer-allocations-fix.patch
mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch
mm-soft-offline-close-the-race-against-page-allocation-fix.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-checkpatch-fixes.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-fix.patch
mm-zero-out-the-vma-in-vma_init.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
proc-kcore-hold-lock-during-read-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
fs-epoll-robustify-irq-safety-with-lockdep_assert_irqs_enabled-fix.patch
checkpatch-check-for-if-0-if-1-fix.patch
checkpatch-warn-when-a-patch-doesnt-have-a-description-fix.patch
fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch
resource-merge-resources-on-a-node-when-hot-adding-memory-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
