The patch titled Subject: mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix has been removed from the -mm tree. Its filename was mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch This patch was dropped because it was folded into mm-fix-race-between-kmem_cache-destroy-create-and-deactivate.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix fix build, per Shakeel Cc: Shakeel Butt <shakeelb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slab.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN mm/slab.h~mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix mm/slab.h --- a/mm/slab.h~mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix +++ a/mm/slab.h @@ -204,6 +204,8 @@ ssize_t slabinfo_write(struct file *file void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **); int __kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **); +extern void kmem_cache_put_locked(struct kmem_cache *s); + #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB) /* List of all root caches. */ @@ -296,7 +298,6 @@ extern void slab_init_memcg_params(struc extern void memcg_link_cache(struct kmem_cache *s); extern void slab_deactivate_memcg_cache_rcu_sched(struct kmem_cache *s, void (*deact_fn)(struct kmem_cache *)); -extern void kmem_cache_put_locked(struct kmem_cache *s); #else /* CONFIG_MEMCG && !CONFIG_SLOB */ /* If !memcg, all caches are root. */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch mm-fix-race-between-kmem_cache-destroy-create-and-deactivate.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-cgroup-aware-oom-killer-fix-2.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch proc-skip-branch-in-proc-lookup-fix.patch kcov-prefault-the-kcov_area-fix.patch kcov-prefault-the-kcov_area-fix-fix.patch kcov-prefault-the-kcov_area-fix-fix-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch mm-fix-oom_kill-event-handling-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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