From: Greg Kroah-Hartman Date: Sun, 29 Jun 2025 07:49:26 +0000 (+0200) Subject: fix up some patch comments that quilt chokes on X-Git-Tag: v6.1.143~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=050d3f700d2af6cb5a7d09d822b4e993a62e87fc;p=thirdparty%2Fkernel%2Fstable-queue.git 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 7b26ad7830..1e42fb4bf4 100644 --- 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 4f2035a418..683f49e800 100644 --- 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 9b96bfedbb..7b4703f6de 100644 --- 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 5bdee8114b..38f88c04ca 100644 --- 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 b5d9c86b15..294cf8f151 100644 --- 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 c3755d3bb9..d3f3e1d9f9 100644 --- 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