The patch titled Subject: slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix has been removed from the -mm tree. Its filename was slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix.patch This patch was dropped because it was folded into slab-use-get_node-and-kmem_cache_node-functions.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix Cc: Christoph Lameter <cl@xxxxxxxxx> Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slab.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN mm/slab.c~slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix mm/slab.c --- a/mm/slab.c~slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix +++ a/mm/slab.c @@ -590,7 +590,8 @@ static inline void on_slab_lock_classes_ { } -static void slab_set_debugobj_lock_classes_node(struct kmem_cache *cachep, int node) +static void slab_set_debugobj_lock_classes_node(struct kmem_cache *cachep, + struct kmem_cache_node *n) { } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch fsnotify-rename-event-handling-functions.patch kbuild-explain-stack-protector-strong-config-logic.patch slub-use-new-node-functions.patch slab-use-get_node-and-kmem_cache_node-functions.patch slab-change-int-to-size_t-for-representing-allocation-size.patch mm-page_allocc-unexport-alloc_pages_exact_nid.patch dma-cma-support-arbitrary-bitmap-granularity-fix.patch mm-vmallocc-add-a-schedule-point-to-vmalloc-fix.patch include-linux-mmdebugh-add-vm_warn_once.patch mm-catch-memory-commitment-underflow-fix.patch mm-hugetlb-generalize-writes-to-nr_hugepages-fix.patch mm-oom-ensure-memoryless-node-zonelist-always-includes-zones-fix.patch list-fix-order-of-arguments-for-hlist_add_after_rcu-checkpatch-fixes.patch add-lib-globc-fix.patch lib-list_sortc-convert-to-pr_foo.patch lib-list_sortc-convert-to-pr_foo-fix.patch checkpatch-add-test-for-commit-id-formatting-style-in-commit-log.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html