From 3053da010f963083832e875f3c9d18c8287431a3 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 23 Oct 2024 07:46:16 -0400 Subject: [PATCH] Drop selftests-mm-fix-the-incorrect-usage-info-of-khugepa.patch Signed-off-by: Sasha Levin --- ...-the-incorrect-usage-info-of-khugepa.patch | 42 ------------------- queue-6.11/series | 1 - 2 files changed, 43 deletions(-) delete mode 100644 queue-6.11/selftests-mm-fix-the-incorrect-usage-info-of-khugepa.patch diff --git a/queue-6.11/selftests-mm-fix-the-incorrect-usage-info-of-khugepa.patch b/queue-6.11/selftests-mm-fix-the-incorrect-usage-info-of-khugepa.patch deleted file mode 100644 index 420fd27d3e5..00000000000 --- a/queue-6.11/selftests-mm-fix-the-incorrect-usage-info-of-khugepa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ad8b93ffe0a86e3b6be297826cd34b12080fc877 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 15 Oct 2024 10:02:57 +0800 -Subject: selftests: mm: fix the incorrect usage() info of khugepaged - -From: Nanyong Sun - -[ Upstream commit 3e822bed2fbd1527d88f483342b1d2a468520a9a ] - -The mount option of tmpfs should be huge=advise, not madvise which is not -supported and may mislead the users. - -Link: https://lkml.kernel.org/r/20241015020257.139235-1-sunnanyong@huawei.com -Fixes: 1b03d0d558a2 ("selftests/vm: add thp collapse file and tmpfs testing") -Signed-off-by: Nanyong Sun -Reviewed-by: Baolin Wang -Reviewed-by: Anshuman Khandual -Cc: Kefeng Wang -Cc: Shuah Khan -Cc: Zach O'Keefe -Signed-off-by: Andrew Morton -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/mm/khugepaged.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c -index 829320a519e72..89dec42986825 100644 ---- a/tools/testing/selftests/mm/khugepaged.c -+++ b/tools/testing/selftests/mm/khugepaged.c -@@ -1091,7 +1091,7 @@ static void usage(void) - fprintf(stderr, "\n\t\"file,all\" mem_type requires kernel built with\n"); - fprintf(stderr, "\tCONFIG_READ_ONLY_THP_FOR_FS=y\n"); - fprintf(stderr, "\n\tif [dir] is a (sub)directory of a tmpfs mount, tmpfs must be\n"); -- fprintf(stderr, "\tmounted with huge=madvise option for khugepaged tests to work\n"); -+ fprintf(stderr, "\tmounted with huge=advise option for khugepaged tests to work\n"); - fprintf(stderr, "\n\tSupported Options:\n"); - fprintf(stderr, "\t\t-h: This help message.\n"); - fprintf(stderr, "\t\t-s: mTHP size, expressed as page order.\n"); --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index f98f2147654..846459905d1 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -93,7 +93,6 @@ drm-xe-don-t-free-job-in-tdr.patch drm-xe-use-bookkeep-slots-for-external-bo-s-in-exec-.patch bpf-fix-link-info-netfilter-flags-to-populate-defrag.patch bluetooth-bnep-fix-wild-memory-access-in-proto_unreg.patch -selftests-mm-fix-the-incorrect-usage-info-of-khugepa.patch vmxnet3-fix-packet-corruption-in-vmxnet3_xdp_xmit_fr.patch net-ethernet-mtk_eth_soc-fix-memory-corruption-durin.patch net-mlx5-check-for-invalid-vector-index-on-eq-creati.patch -- 2.47.2