aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-29 09:49:26 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-29 09:49:26 +0200
commit050d3f700d2af6cb5a7d09d822b4e993a62e87fc (patch)
tree1b186168d5e33a74f7727d103ae0e50a6cadd7f8
parent921083cff215713f691224782bc632458558f186 (diff)
downloadstable-queue-050d3f700d2af6cb5a7d09d822b4e993a62e87fc.tar.gz
fix up some patch comments that quilt chokes on
-rw-r--r--queue-5.10/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch24
-rw-r--r--queue-5.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch24
-rw-r--r--queue-6.1/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch24
-rw-r--r--queue-6.12/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch24
-rw-r--r--queue-6.15/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch24
-rw-r--r--queue-6.6/f2fs-don-t-over-report-free-space-or-inodes-in-statv.patch24
6 files changed, 72 insertions, 72 deletions
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 7b26ad78303..1e42fb4bf48 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 4f2035a418d..683f49e800e 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 9b96bfedbb2..7b4703f6dee 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 5bdee8114be..38f88c04ca4 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 b5d9c86b15d..294cf8f151a 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 c3755d3bb96..d3f3e1d9f98 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