Subject: [folded-merged] mm-memblock-add-memblock-memory-allocation-apis-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,arnd@xxxxxxxx,cl@xxxxxxxxxxxxxxxxxxxx,gregkh@xxxxxxxxxxxxxxxxxxx,grygorii.strashko@xxxxxx,hannes@xxxxxxxxxxx,hpa@xxxxxxxxx,kamezawa.hiroyu@xxxxxxxxxxxxxx,konrad.wilk@xxxxxxxxxx,linux@xxxxxxxxxxxxxxxx,mhocko@xxxxxxx,paul@xxxxxxxxx,pavel@xxxxxx,rjw@xxxxxxx,santosh.shilimkar@xxxxxx,tj@xxxxxxxxxx,tony@xxxxxxxxxxx,yinghai@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 21 Jan 2014 15:33:41 -0800 The patch titled Subject: mm-memblock-add-memblock-memory-allocation-apis-fix has been removed from the -mm tree. Its filename was mm-memblock-add-memblock-memory-allocation-apis-fix.patch This patch was dropped because it was folded into mm-memblock-add-memblock-memory-allocation-apis.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-memblock-add-memblock-memory-allocation-apis-fix s/depricated/deprecated/ Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Grygorii Strashko <grygorii.strashko@xxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Paul Walmsley <paul@xxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Yinghai Lu <yinghai@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memblock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN mm/memblock.c~mm-memblock-add-memblock-memory-allocation-apis-fix mm/memblock.c --- a/mm/memblock.c~mm-memblock-add-memblock-memory-allocation-apis-fix +++ a/mm/memblock.c @@ -788,7 +788,7 @@ void __init_memblock __next_free_mem_ran bool check_node = (nid != NUMA_NO_NODE) && (nid != MAX_NUMNODES); if (nid == MAX_NUMNODES) - pr_warn_once("%s: Usage of MAX_NUMNODES is depricated. Use NUMA_NO_NODE instead\n", + pr_warn_once("%s: Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n", __func__); for ( ; mi < mem->cnt; mi++) { @@ -861,7 +861,7 @@ void __init_memblock __next_free_mem_ran bool check_node = (nid != NUMA_NO_NODE) && (nid != MAX_NUMNODES); if (nid == MAX_NUMNODES) - pr_warn_once("%s: Usage of MAX_NUMNODES is depricated. Use NUMA_NO_NODE instead\n", + pr_warn_once("%s: Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n", __func__); if (*idx == (u64)ULLONG_MAX) { @@ -1068,7 +1068,7 @@ static void * __init memblock_virt_alloc void *ptr; if (nid == MAX_NUMNODES) - pr_warn("%s: usage of MAX_NUMNODES is depricated. Use NUMA_NO_NODE\n", + pr_warn("%s: usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE\n", __func__); if (WARN_ON_ONCE(slab_is_available())) _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch posix_acl-uninlining.patch mm-hugetlbfs-move-the-put-get_page-slab-and-hugetlbfs-optimization-in-a-faster-path.patch mm-hugetlbc-simplify-pageheadhuge-and-pagehuge.patch mm-swapc-reorganize-put_compound_page.patch mm-get-rid-of-unnecessary-pageblock-scanning-in-setup_zone_migrate_reserve.patch mm-memory-failure-fix-the-typo-in-me_pagecache_dirty.patch mm-show_mem-remove-show_mem_filter_page_count.patch mm-add-overcommit_kbytes-sysctl-variable.patch memblock-mem_hotplug-introduce-memblock_hotplug-flag-to-mark-hotpluggable-regions.patch acpi-numa-mem_hotplug-mark-hotpluggable-memory-in-memblock.patch memblock-mem_hotplug-make-memblock-skip-hotpluggable-regions-if-needed.patch mm-memblock-add-memblock-memory-allocation-apis.patch sched-add-tracepoints-related-to-numa-task-migration-fix.patch mm-page_alloc-warn-for-non-blockable-__gfp_nofail-allocation-failure.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