The patch titled Subject: mm-fix-huge-zero-page-accounting-in-smaps-report-fix has been removed from the -mm tree. Its filename was mm-fix-huge-zero-page-accounting-in-smaps-report-fix.patch This patch was dropped because it was folded into mm-fix-huge-zero-page-accounting-in-smaps-report.patch ------------------------------------------------------ From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx> Subject: mm-fix-huge-zero-page-accounting-in-smaps-report-fix Return type should be 'unsigned long'. Andrew, please fold this into the patch: Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc/include/asm/pgtable_64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/sparc/include/asm/pgtable_64.h~mm-fix-huge-zero-page-accounting-in-smaps-report-fix arch/sparc/include/asm/pgtable_64.h --- a/arch/sparc/include/asm/pgtable_64.h~mm-fix-huge-zero-page-accounting-in-smaps-report-fix +++ a/arch/sparc/include/asm/pgtable_64.h @@ -667,7 +667,7 @@ static inline unsigned long pmd_pfn(pmd_ } #ifdef CONFIG_TRANSPARENT_HUGEPAGE -static inline pmd_t pmd_dirty(pmd_t pmd) +static inline unsigned long pmd_dirty(pmd_t pmd) { pte_t pte = __pte(pmd_val(pmd)); _ Patches currently in -mm which might be from kirill@xxxxxxxxxxxxx are origin.patch mm-verify-compound-order-when-freeing-a-page.patch thp-do-not-mark-zero-page-pmd-write-protected-explicitly.patch mm-fix-huge-zero-page-accounting-in-smaps-report.patch mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2.patch mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2-fix.patch mm-embed-the-memcg-pointer-directly-into-struct-page.patch mm-embed-the-memcg-pointer-directly-into-struct-page-fix.patch mm-page_cgroup-rename-file-to-mm-swap_cgroupc.patch mm-move-page-mem_cgroup-bad-page-handling-into-generic-code.patch mm-move-page-mem_cgroup-bad-page-handling-into-generic-code-fix.patch mm-move-page-mem_cgroup-bad-page-handling-into-generic-code-fix-2.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