diff for duplicates of <529F5047.50309@ti.com> diff --git a/a/1.txt b/N1/1.txt index 37f7b47..55a47f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -240,7 +240,7 @@ index d333ac4..b518b75 100644 - * APIs (including nobootmem). - */ - - /* FIXME: Move to memblock.h@a point where we remove nobootmem.c */ + /* FIXME: Move to memblock.h at a point where we remove nobootmem.c */ void *memblock_virt_alloc_try_nid_nopanic(phys_addr_t size, phys_addr_t align, phys_addr_t from, @@ -171,20 +159,20 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size); @@ -627,3 +627,10 @@ index f74902c..f7cc387 100644 /* kmemleak tracks the percpu allocations separately */ -- 1.7.9.5 + + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index f9493e7..48fcfc9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,16 @@ "ref\01386037658-3161-1-git-send-email-santosh.shilimkar@ti.com\0" "ref\01386037658-3161-9-git-send-email-santosh.shilimkar@ti.com\0" "ref\020131203232445.GX8277@htj.dyndns.org\0" - "From\0santosh.shilimkar@ti.com (Santosh Shilimkar)\0" - "Subject\0[PATCH v2 08/23] mm/memblock: Add memblock memory allocation apis\0" + "From\0Santosh Shilimkar <santosh.shilimkar@ti.com>\0" + "Subject\0Re: [PATCH v2 08/23] mm/memblock: Add memblock memory allocation apis\0" "Date\0Wed, 4 Dec 2013 10:54:47 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Tejun Heo <tj@kernel.org>\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + linux-mm@kvack.org + Yinghai Lu <yinghai@kernel.org> + Andrew Morton <akpm@linux-foundation.org> + " Grygorii Strashko <grygorii.strashko@ti.com>\0" "\00:1\0" "b\0" "On Tuesday 03 December 2013 06:24 PM, Tejun Heo wrote:\n" @@ -249,7 +255,7 @@ "- * APIs (including nobootmem).\n" "- */\n" "-\n" - " /* FIXME: Move to memblock.h@a point where we remove nobootmem.c */\n" + " /* FIXME: Move to memblock.h at a point where we remove nobootmem.c */\n" " void *memblock_virt_alloc_try_nid_nopanic(phys_addr_t size,\n" " \t\tphys_addr_t align, phys_addr_t from,\n" "@@ -171,20 +159,20 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size);\n" @@ -635,6 +641,13 @@ " \t\tpanic(\"Failed to allocate memory for percpu areas.\");\n" " \t/* kmemleak tracks the percpu allocations separately */\n" "-- \n" - 1.7.9.5 + "1.7.9.5\n" + "\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -683a7f563a46e321334d68a6a9a000be15bdc240c083e21e8da605b8ec1820d6 +84b00be10456424f4b1976638a4b30f24976971e57b406fd7fee3857b7ec9e15
diff --git a/a/1.txt b/N2/1.txt index 37f7b47..2c295fd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -240,7 +240,7 @@ index d333ac4..b518b75 100644 - * APIs (including nobootmem). - */ - - /* FIXME: Move to memblock.h@a point where we remove nobootmem.c */ + /* FIXME: Move to memblock.h at a point where we remove nobootmem.c */ void *memblock_virt_alloc_try_nid_nopanic(phys_addr_t size, phys_addr_t align, phys_addr_t from, @@ -171,20 +159,20 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size); diff --git a/a/content_digest b/N2/content_digest index f9493e7..4b42133 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,16 @@ "ref\01386037658-3161-1-git-send-email-santosh.shilimkar@ti.com\0" "ref\01386037658-3161-9-git-send-email-santosh.shilimkar@ti.com\0" "ref\020131203232445.GX8277@htj.dyndns.org\0" - "From\0santosh.shilimkar@ti.com (Santosh Shilimkar)\0" - "Subject\0[PATCH v2 08/23] mm/memblock: Add memblock memory allocation apis\0" + "From\0Santosh Shilimkar <santosh.shilimkar@ti.com>\0" + "Subject\0Re: [PATCH v2 08/23] mm/memblock: Add memblock memory allocation apis\0" "Date\0Wed, 4 Dec 2013 10:54:47 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Tejun Heo <tj@kernel.org>\0" + "Cc\0<linux-kernel@vger.kernel.org>" + <linux-arm-kernel@lists.infradead.org> + <linux-mm@kvack.org> + Yinghai Lu <yinghai@kernel.org> + Andrew Morton <akpm@linux-foundation.org> + " Grygorii Strashko <grygorii.strashko@ti.com>\0" "\00:1\0" "b\0" "On Tuesday 03 December 2013 06:24 PM, Tejun Heo wrote:\n" @@ -249,7 +255,7 @@ "- * APIs (including nobootmem).\n" "- */\n" "-\n" - " /* FIXME: Move to memblock.h@a point where we remove nobootmem.c */\n" + " /* FIXME: Move to memblock.h at a point where we remove nobootmem.c */\n" " void *memblock_virt_alloc_try_nid_nopanic(phys_addr_t size,\n" " \t\tphys_addr_t align, phys_addr_t from,\n" "@@ -171,20 +159,20 @@ void __memblock_free_late(phys_addr_t base, phys_addr_t size);\n" @@ -637,4 +643,4 @@ "-- \n" 1.7.9.5 -683a7f563a46e321334d68a6a9a000be15bdc240c083e21e8da605b8ec1820d6 +e3c995e68ac0c78c1bf7a0041bfb68b98de77ce732a70ed84d1ca6d4c415aecb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.