Subject: [merged] mm-hwpoison-add-to-hwpoison_inject.patch removed from -mm tree
To: liwanp@xxxxxxxxxxxxxxxxxx,murzin.v@xxxxxxxxx,n-horiguchi@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 22 Jan 2014 12:14:34 -0800
The patch titled
Subject: mm/hwpoison: add '#' to hwpoison_inject
has been removed from the -mm tree. Its filename was
mm-hwpoison-add-to-hwpoison_inject.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx>
Subject: mm/hwpoison: add '#' to hwpoison_inject
Add '#' to hwpoison_inject just as done in madvise_hwpoison.
Signed-off-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Reviewed-by: Vladimir Murzin <murzin.v@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hwpoison-inject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/hwpoison-inject.c~mm-hwpoison-add-to-hwpoison_inject mm/hwpoison-inject.c
--- a/mm/hwpoison-inject.c~mm-hwpoison-add-to-hwpoison_inject
+++ a/mm/hwpoison-inject.c
@@ -55,7 +55,7 @@ static int hwpoison_inject(void *data, u
return 0;
inject:
- printk(KERN_INFO "Injecting memory failure at pfn %lx\n", pfn);
+ pr_info("Injecting memory failure at pfn %#lx\n", pfn);
return memory_failure(pfn, 18, MF_COUNT_INCREASED);
}
_
Patches currently in -mm which might be from liwanp@xxxxxxxxxxxxxxxxxx are
origin.patch
mm-remove-bug_on-from-mlock_vma_page.patch
mm-documentation-remove-hopelessly-out-of-date-locking-doc.patch
mm-memory-failurec-shift-page-lock-from-head-page-to-tail-page-after-thp-split.patch
mm-new_vma_page-cannot-see-null-vma-for-hugetlb-pages.patch
linux-next.patch
mm-migratec-fix-setting-of-cpupid-on-page-migration-twice-against-normal-page.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
