Subject: [folded-merged] mm-thp-withdraw-the-pgtable-after-pmdp-related-operations-fix.patch removed from -mm tree To: aneesh.kumar@xxxxxxxxxxxxxxxxxx,fengguang.wu@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 05 Jun 2013 17:13:14 -0700 The patch titled Subject: mm-thp-withdraw-the-pgtable-after-pmdp-related-operations-fix has been removed from the -mm tree. Its filename was mm-thp-withdraw-the-pgtable-after-pmdp-related-operations-fix.patch This patch was dropped because it was folded into mm-thp-withdraw-the-pgtable-after-pmdp-related-operations.patch ------------------------------------------------------ From: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Subject: mm-thp-withdraw-the-pgtable-after-pmdp-related-operations-fix s390: Fix build error Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/s390/include/asm/pgtable.h~mm-thp-withdraw-the-pgtable-after-pmdp-related-operations-fix arch/s390/include/asm/pgtable.h --- a/arch/s390/include/asm/pgtable.h~mm-thp-withdraw-the-pgtable-after-pmdp-related-operations-fix +++ a/arch/s390/include/asm/pgtable.h @@ -1348,7 +1348,7 @@ static inline pmd_t pmd_mkwrite(pmd_t pm #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_PGTABLE_DEPOSIT -extern void pgtable_trans_huge_deposit(struct mm_struct *mm, , pmd_t *pmdp, +extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp, pgtable_t pgtable); #define __HAVE_ARCH_PGTABLE_WITHDRAW _ Patches currently in -mm which might be from aneesh.kumar@xxxxxxxxxxxxxxxxxx are linux-next.patch mm-thp-use-the-right-function-when-updating-access-flags.patch mm-thp-add-pmd-args-to-pgtable-deposit-and-withdraw-apis.patch mm-thp-withdraw-the-pgtable-after-pmdp-related-operations.patch mm-thp-dont-use-hpage_shift-in-transparent-hugepage-code.patch mm-thp-deposit-the-transpare-huge-pgtable-before-set_pmd.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