From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: [folded-merged] khugepaged-add-self-test-fix.patch removed from -mm tree Date: Wed, 03 Jun 2020 15:11:55 -0700 Message-ID: <20200603221155.NpQ2kF_Nt%akpm@linux-foundation.org> References: <20200602130930.8e8f10fa6f19e3766e70921f@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:51892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726354AbgFCWL5 (ORCPT ); Wed, 3 Jun 2020 18:11:57 -0400 In-Reply-To: <20200602130930.8e8f10fa6f19e3766e70921f@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: colin.king@canonical.com, kirill@shutemov.name, mm-commits@vger.kernel.org The patch titled Subject: selftests: khugepaged: fix several spelling mistakes has been removed from the -mm tree. Its filename was khugepaged-add-self-test-fix.patch This patch was dropped because it was folded into khugepaged-add-self-test.patch ------------------------------------------------------ From: Colin Ian King Subject: selftests: khugepaged: fix several spelling mistakes There a are several spelling mistakes in various messages. Fix these. There are three spelling mistakes in various messages. Fix these. Link: http://lkml.kernel.org/r/20200420084241.65433-1-colin.king@canonical.com Signed-off-by: Colin Ian King Cc: "Kirill A. Shutemov" Signed-off-by: Andrew Morton --- tools/testing/selftests/vm/khugepaged.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/tools/testing/selftests/vm/khugepaged.c~khugepaged-add-self-test-fix +++ a/tools/testing/selftests/vm/khugepaged.c @@ -534,7 +534,7 @@ static void collapse_max_ptes_none(void) p = alloc_mapping(); fill_memory(p, 0, (hpage_pmd_nr - max_ptes_none - 1) * page_size); - if (wait_for_scan("Do not collapse with max_ptes_none exeeded", p)) + if (wait_for_scan("Do not collapse with max_ptes_none exceeded", p)) fail("Timeout"); else if (check_huge(p)) fail("Fail"); @@ -573,7 +573,7 @@ static void collapse_swapin_single_pte(v goto out; } - if (wait_for_scan("Collapse with swaping in single PTE entry", p)) + if (wait_for_scan("Collapse with swapping in single PTE entry", p)) fail("Timeout"); else if (check_huge(p)) success("OK"); @@ -604,7 +604,7 @@ static void collapse_max_ptes_swap(void) goto out; } - if (wait_for_scan("Do not collapse with max_ptes_swap exeeded", p)) + if (wait_for_scan("Do not collapse with max_ptes_swap exceeded", p)) fail("Timeout"); else if (check_huge(p)) fail("Fail"); @@ -651,14 +651,14 @@ static void collapse_single_pte_entry_co fail("Fail"); madvise(p, hpage_pmd_size, MADV_NOHUGEPAGE); - printf("Split huge page leaving single PTE mapping compount page..."); + printf("Split huge page leaving single PTE mapping compound page..."); madvise(p + page_size, hpage_pmd_size - page_size, MADV_DONTNEED); if (!check_huge(p)) success("OK"); else fail("Fail"); - if (wait_for_scan("Collapse PTE table with single PTE mapping compount page", p)) + if (wait_for_scan("Collapse PTE table with single PTE mapping compound page", p)) fail("Timeout"); else if (check_huge(p)) success("OK"); @@ -682,7 +682,7 @@ static void collapse_full_of_compound(vo else fail("Fail"); - printf("Split huge page leaving single PTE page table full of compount pages..."); + printf("Split huge page leaving single PTE page table full of compound pages..."); madvise(p, page_size, MADV_NOHUGEPAGE); madvise(p, hpage_pmd_size, MADV_NOHUGEPAGE); if (!check_huge(p)) _ Patches currently in -mm which might be from colin.king@canonical.com are khugepaged-add-self-test.patch khugepaged-introduce-max_ptes_shared-tunable-fix.patch