Subject: [folded-merged] lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,b42378@xxxxxxxxxxxxx,joe@xxxxxxxxxxx,p.zabel@xxxxxxxxxxxxxx,prabhakar.csengg@xxxxxxxxx,sachin.kamat@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 23 Jan 2014 15:23:28 -0800 The patch titled Subject: lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix has been removed from the -mm tree. Its filename was lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix.patch This patch was dropped because it was folded into lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix Cc: "Lad, Prabhakar" <prabhakar.csengg@xxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Cc: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx> Cc: Nicolin Chen <b42378@xxxxxxxxxxxxx> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> Cc: Sachin Kamat <sachin.kamat@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/genalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN lib/genalloc.c~lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix lib/genalloc.c --- a/lib/genalloc.c~lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null-fix +++ a/lib/genalloc.c @@ -316,7 +316,7 @@ EXPORT_SYMBOL(gen_pool_alloc); * gen_pool_dma_alloc - allocate special memory from the pool for DMA usage * @pool: pool to allocate from * @size: number of bytes to allocate from the pool - * @dma: dma-view physical address + * @dma: dma-view physical address return value. Use NULL if unneeded. * * Allocate the requested number of bytes from the specified pool. * Uses the pool allocation function (with first-fit algorithm by default). _ 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.patch mm-nobootmem-free_all_bootmem-again.patch mm-improve-documentation-of-page_order-v2.patch lib-parserc-put-export_symbols-in-the-conventional-place.patch printk-flush-conflicting-continuation-line.patch lib-genallocc-add-check-gen_pool_dma_alloc-if-dma-pointer-is-not-null.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