Subject: [folded-merged] memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,bsingharora@xxxxxxxxx,cl@xxxxxxxxx,glommer@xxxxxxxxx,hannes@xxxxxxxxxxx,kamezawa.hiroyu@xxxxxxxxxxxxxx,mhocko@xxxxxxx,penberg@xxxxxxxxxx,vdavydov@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 23 Jan 2014 15:18:33 -0800 The patch titled Subject: memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path-fix has been removed from the -mm tree. Its filename was memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path-fix.patch This patch was dropped because it was folded into memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path-fix fix build Cc: Balbir Singh <bsingharora@xxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: Glauber Costa <glommer@xxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/memcontrol.h~memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path-fix include/linux/memcontrol.h --- a/include/linux/memcontrol.h~memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path-fix +++ a/include/linux/memcontrol.h @@ -647,7 +647,7 @@ static inline int memcg_alloc_cache_para return 0; } -static inline void memcg_free_cache_params(struct kmem_cache *s); +static inline void memcg_free_cache_params(struct kmem_cache *s) { } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-print-more-details-for-bad_page.patch mm-munlock-fix-potential-race-with-thp-page-split.patch mm-dump-page-when-hitting-a-vm_bug_on-using-vm_bug_on_page.patch memcg-slab-kmem_cache_create_memcg-fix-memleak-on-fail-path.patch numa-add-a-sysctl-for-numa_balancing-fix.patch mm-nobootmem-free_all_bootmem-again-fix-fix.patch mm-improve-documentation-of-page_order-v2-fix.patch lib-parserc-put-export_symbols-in-the-conventional-place.patch printk-flush-conflicting-continuation-line-fix.patch lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix.patch drivers-rtc-rtc-cmosc-propagate-hpet_register_irq_handler-failure.patch fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix.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