From: Greg Kroah-Hartman Date: Tue, 18 Feb 2025 13:24:49 +0000 (+0100) Subject: fix some comments so that quilt can handle them X-Git-Tag: v6.1.129~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4de9bc31c7f286feaf21f396d3c52058e6676d82;p=thirdparty%2Fkernel%2Fstable-queue.git fix some comments so that quilt can handle them --- diff --git a/queue-6.12/btrfs-fix-stale-page-cache-after-race-between-readah.patch b/queue-6.12/btrfs-fix-stale-page-cache-after-race-between-readah.patch index 284f293dae..5433e2f877 100644 --- a/queue-6.12/btrfs-fix-stale-page-cache-after-race-between-readah.patch +++ b/queue-6.12/btrfs-fix-stale-page-cache-after-race-between-readah.patch @@ -24,8 +24,8 @@ like this: MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1 generic/418 14s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//generic/418.out.bad) - --- tests/generic/418.out 2020-06-10 19:29:03.850519863 +0100 - +++ /home/fdmanana/git/hub/xfstests/results//generic/418.out.bad 2025-02-03 15:42:36.974609476 +0000 +# --- tests/generic/418.out 2020-06-10 19:29:03.850519863 +0100 +# +++ /home/fdmanana/git/hub/xfstests/results//generic/418.out.bad 2025-02-03 15:42:36.974609476 +0000 @@ -1,2 +1,5 @@ QA output created by 418 +cmpbuf: offset 0: Expected: 0x1, got 0x0 diff --git a/queue-6.13/btrfs-fix-stale-page-cache-after-race-between-readah.patch b/queue-6.13/btrfs-fix-stale-page-cache-after-race-between-readah.patch index b1acc6735b..448ea7fb28 100644 --- a/queue-6.13/btrfs-fix-stale-page-cache-after-race-between-readah.patch +++ b/queue-6.13/btrfs-fix-stale-page-cache-after-race-between-readah.patch @@ -24,8 +24,8 @@ like this: MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1 generic/418 14s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//generic/418.out.bad) - --- tests/generic/418.out 2020-06-10 19:29:03.850519863 +0100 - +++ /home/fdmanana/git/hub/xfstests/results//generic/418.out.bad 2025-02-03 15:42:36.974609476 +0000 +# --- tests/generic/418.out 2020-06-10 19:29:03.850519863 +0100 +# +++ /home/fdmanana/git/hub/xfstests/results//generic/418.out.bad 2025-02-03 15:42:36.974609476 +0000 @@ -1,2 +1,5 @@ QA output created by 418 +cmpbuf: offset 0: Expected: 0x1, got 0x0