fix up some patch comments that quilt chokes on

diff --git a/queue-5.10/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch b/queue-5.10/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
index 7b26ad7830319737895810d6be0835d064fa3297..1e42fb4bf483d2906143fd1832197722707f5347 100644 (file)
--- a/queue-5.10/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
+++ b/queue-5.10/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
@@ -20,18 +20,18 @@ This commit will resolve a test failure in generic/762 which tests
 for this bug.
 
 generic/762       - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
-    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
-    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
-    @@ -6,8 +6,10 @@
-     root blocks2 is in range
-     dir blocks2 is in range
-     root bavail2 is in range
-    -dir bavail2 is in range
-    +dir bavail2 has value of 1539066
-    +dir bavail2 is NOT in range 304734.87 .. 310891.13
-     root blocks3 is in range
-    ...
-    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
+#    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
+#    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
+#    @@ -6,8 +6,10 @@
+#     root blocks2 is in range
+#     dir blocks2 is in range
+#     root bavail2 is in range
+#    -dir bavail2 is in range
+#    +dir bavail2 has value of 1539066
+#    +dir bavail2 is NOT in range 304734.87 .. 310891.13
+#     root blocks3 is in range
+#    ...
+#    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs

diff --git a/queue-5.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch b/queue-5.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
index 4f2035a418dc87dfa0c3f21d9a59a8f59853d02a..683f49e800ef9b78624d0006579a1bd396feee64 100644 (file)
--- a/queue-5.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
+++ b/queue-5.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
@@ -20,18 +20,18 @@ This commit will resolve a test failure in generic/762 which tests
 for this bug.
 
 generic/762       - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
-    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
-    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
-    @@ -6,8 +6,10 @@
-     root blocks2 is in range
-     dir blocks2 is in range
-     root bavail2 is in range
-    -dir bavail2 is in range
-    +dir bavail2 has value of 1539066
-    +dir bavail2 is NOT in range 304734.87 .. 310891.13
-     root blocks3 is in range
-    ...
-    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
+#    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
+#    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
+#    @@ -6,8 +6,10 @@
+#     root blocks2 is in range
+#     dir blocks2 is in range
+#     root bavail2 is in range
+#    -dir bavail2 is in range
+#    +dir bavail2 has value of 1539066
+#    +dir bavail2 is NOT in range 304734.87 .. 310891.13
+#     root blocks3 is in range
+#    ...
+#    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs

diff --git a/queue-6.1/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch b/queue-6.1/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
index 9b96bfedbb2d9293b749ed7ec427f99dd7756be0..7b4703f6deeb2b3c7fc1f94c258a2419e64094ca 100644 (file)
--- a/queue-6.1/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
+++ b/queue-6.1/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
@@ -20,18 +20,18 @@ This commit will resolve a test failure in generic/762 which tests
 for this bug.
 
 generic/762       - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
-    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
-    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
-    @@ -6,8 +6,10 @@
-     root blocks2 is in range
-     dir blocks2 is in range
-     root bavail2 is in range
-    -dir bavail2 is in range
-    +dir bavail2 has value of 1539066
-    +dir bavail2 is NOT in range 304734.87 .. 310891.13
-     root blocks3 is in range
-    ...
-    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
+#    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
+#    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
+#    @@ -6,8 +6,10 @@
+#     root blocks2 is in range
+#     dir blocks2 is in range
+#     root bavail2 is in range
+#    -dir bavail2 is in range
+#    +dir bavail2 has value of 1539066
+#    +dir bavail2 is NOT in range 304734.87 .. 310891.13
+#     root blocks3 is in range
+#    ...
+#    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs

diff --git a/queue-6.12/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch b/queue-6.12/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
index 5bdee8114bed38e7a66f1c737a3e8bb7971da17d..38f88c04ca4345aa6537b1e520caf461453f11bf 100644 (file)
--- a/queue-6.12/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
+++ b/queue-6.12/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
@@ -20,18 +20,18 @@ This commit will resolve a test failure in generic/762 which tests
 for this bug.
 
 generic/762       - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
-    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
-    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
-    @@ -6,8 +6,10 @@
-     root blocks2 is in range
-     dir blocks2 is in range
-     root bavail2 is in range
-    -dir bavail2 is in range
-    +dir bavail2 has value of 1539066
-    +dir bavail2 is NOT in range 304734.87 .. 310891.13
-     root blocks3 is in range
-    ...
-    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
+#    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
+#    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
+#    @@ -6,8 +6,10 @@
+#     root blocks2 is in range
+#     dir blocks2 is in range
+#     root bavail2 is in range
+#    -dir bavail2 is in range
+#    +dir bavail2 has value of 1539066
+#    +dir bavail2 is NOT in range 304734.87 .. 310891.13
+#     root blocks3 is in range
+#    ...
+#    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs

diff --git a/queue-6.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch b/queue-6.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
index b5d9c86b15dd8a1d93334c84c508cd67a6995948..294cf8f151a50d115fd99fe53bba927372f966eb 100644 (file)
--- a/queue-6.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
+++ b/queue-6.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
@@ -20,18 +20,18 @@ This commit will resolve a test failure in generic/762 which tests
 for this bug.
 
 generic/762       - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
-    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
-    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
-    @@ -6,8 +6,10 @@
-     root blocks2 is in range
-     dir blocks2 is in range
-     root bavail2 is in range
-    -dir bavail2 is in range
-    +dir bavail2 has value of 1539066
-    +dir bavail2 is NOT in range 304734.87 .. 310891.13
-     root blocks3 is in range
-    ...
-    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
+#    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
+#    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
+#    @@ -6,8 +6,10 @@
+#     root blocks2 is in range
+#     dir blocks2 is in range
+#     root bavail2 is in range
+#    -dir bavail2 is in range
+#    +dir bavail2 has value of 1539066
+#    +dir bavail2 is NOT in range 304734.87 .. 310891.13
+#     root blocks3 is in range
+#    ...
+#    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs

diff --git a/queue-6.6/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch b/queue-6.6/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
index c3755d3bb9641652eb2a427fcf3d133e16ec8386..d3f3e1d9f98c2262ff37aaabcc275de58eeeb42b 100644 (file)
--- a/queue-6.6/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
+++ b/queue-6.6/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch
@@ -20,18 +20,18 @@ This commit will resolve a test failure in generic/762 which tests
 for this bug.
 
 generic/762       - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
-    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
-    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
-    @@ -6,8 +6,10 @@
-     root blocks2 is in range
-     dir blocks2 is in range
-     root bavail2 is in range
-    -dir bavail2 is in range
-    +dir bavail2 has value of 1539066
-    +dir bavail2 is NOT in range 304734.87 .. 310891.13
-     root blocks3 is in range
-    ...
-    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
+#    --- tests/generic/762.out   2025-04-15 10:21:53.371067071 +0800
+#    +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800
+#    @@ -6,8 +6,10 @@
+#     root blocks2 is in range
+#     dir blocks2 is in range
+#     root bavail2 is in range
+#    -dir bavail2 is in range
+#    +dir bavail2 has value of 1539066
+#    +dir bavail2 is NOT in range 304734.87 .. 310891.13
+#     root blocks3 is in range
+#    ...
+#    (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs