]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
add some comments to some patch changelogs to make quilt happy
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 Mar 2024 12:57:29 +0000 (13:57 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 Mar 2024 12:57:29 +0000 (13:57 +0100)
queue-6.6/f2fs-fix-to-create-selinux-label-during-whiteout-ini.patch
queue-6.7/f2fs-fix-to-create-selinux-label-during-whiteout-ini.patch
queue-6.8/btrfs-fix-race-when-detecting-delalloc-ranges-during.patch
queue-6.8/f2fs-fix-to-create-selinux-label-during-whiteout-ini.patch

index 2d8f0700cd94fed6fcd18f27ce04221801f98645..cc8f9d5b71d6be00f777a9749b49ebe07b4ae58d 100644 (file)
@@ -7,16 +7,16 @@ From: Chao Yu <chao@kernel.org>
 
 [ Upstream commit 40b2d55e045222dd6de2a54a299f682e0f954b03 ]
 
-generic/700       - output mismatch (see /media/fstests/results//generic/700.out.bad)
-    --- tests/generic/700.out  2023-03-28 10:40:42.735529223 +0000
-    +++ /media/fstests/results//generic/700.out.bad    2024-02-06 04:37:56.000000000 +0000
-    @@ -1,2 +1,4 @@
-     QA output created by 700
-    +/mnt/scratch_f2fs/f1: security.selinux: No such attribute
-    +/mnt/scratch_f2fs/f2: security.selinux: No such attribute
-     Silence is golden
-    ...
-    (Run 'diff -u /media/fstests/tests/generic/700.out /media/fstests/results//generic/700.out.bad'  to see the entire diff)
+#generic/700       - output mismatch (see /media/fstests/results//generic/700.out.bad)
+#    --- tests/generic/700.out 2023-03-28 10:40:42.735529223 +0000
+#    +++ /media/fstests/results//generic/700.out.bad   2024-02-06 04:37:56.000000000 +0000
+#    @@ -1,2 +1,4 @@
+#     QA output created by 700
+#    +/mnt/scratch_f2fs/f1: security.selinux: No such attribute
+#    +/mnt/scratch_f2fs/f2: security.selinux: No such attribute
+#     Silence is golden
+#    ...
+#    (Run 'diff -u /media/fstests/tests/generic/700.out /media/fstests/results//generic/700.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       70b589a37e1a xfs: add selinux labels to whiteout inodes
index 70dc36db73d3ce5c27d9b2ab3cb58ce4d1188c29..b8bee70ec9c36b7b361eaaa6339565cd601e86c4 100644 (file)
@@ -7,16 +7,16 @@ From: Chao Yu <chao@kernel.org>
 
 [ Upstream commit 40b2d55e045222dd6de2a54a299f682e0f954b03 ]
 
-generic/700       - output mismatch (see /media/fstests/results//generic/700.out.bad)
-    --- tests/generic/700.out  2023-03-28 10:40:42.735529223 +0000
-    +++ /media/fstests/results//generic/700.out.bad    2024-02-06 04:37:56.000000000 +0000
-    @@ -1,2 +1,4 @@
-     QA output created by 700
-    +/mnt/scratch_f2fs/f1: security.selinux: No such attribute
-    +/mnt/scratch_f2fs/f2: security.selinux: No such attribute
-     Silence is golden
-    ...
-    (Run 'diff -u /media/fstests/tests/generic/700.out /media/fstests/results//generic/700.out.bad'  to see the entire diff)
+#generic/700       - output mismatch (see /media/fstests/results//generic/700.out.bad)
+#    --- tests/generic/700.out 2023-03-28 10:40:42.735529223 +0000
+#    +++ /media/fstests/results//generic/700.out.bad   2024-02-06 04:37:56.000000000 +0000
+#    @@ -1,2 +1,4 @@
+#     QA output created by 700
+#    +/mnt/scratch_f2fs/f1: security.selinux: No such attribute
+#    +/mnt/scratch_f2fs/f2: security.selinux: No such attribute
+#     Silence is golden
+#    ...
+#    (Run 'diff -u /media/fstests/tests/generic/700.out /media/fstests/results//generic/700.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       70b589a37e1a xfs: add selinux labels to whiteout inodes
index e0f5eb0f308f713d91415b32044307037e2e1c88..2677172f1bcbe20121ce01562b02cb1aa1e97a91 100644 (file)
@@ -66,19 +66,19 @@ The race happens like this:
 This could actually be sporadically triggered with test case generic/094
 from fstests, which reports a missing extent/delalloc range like this:
 
-  generic/094 2s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad)
-      --- tests/generic/094.out        2020-06-10 19:29:03.830519425 +0100
-      +++ /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad 2024-02-28 11:00:00.381071525 +0000
-      @@ -1,3 +1,9 @@
-       QA output created by 094
-       fiemap run with sync
-       fiemap run without sync
-      +ERROR: couldn't find extent at 7
-      +map is 'HHDDHPPDPHPH'
-      +logical: [       5..       6] phys:   301517..  301518 flags: 0x800 tot: 2
-      +logical: [       8..       8] phys:   301520..  301520 flags: 0x800 tot: 1
-      ...
-      (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/generic/094.out /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad'  to see the entire diff)
+#  generic/094 2s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad)
+#      --- tests/generic/094.out       2020-06-10 19:29:03.830519425 +0100
+#      +++ /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad        2024-02-28 11:00:00.381071525 +0000
+#      @@ -1,3 +1,9 @@
+#       QA output created by 094
+#       fiemap run with sync
+#       fiemap run without sync
+#      +ERROR: couldn't find extent at 7
+#      +map is 'HHDDHPPDPHPH'
+#      +logical: [       5..       6] phys:   301517..  301518 flags: 0x800 tot: 2
+#      +logical: [       8..       8] phys:   301520..  301520 flags: 0x800 tot: 1
+#      ...
+#      (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/generic/094.out /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad'  to see the entire diff)
 
 So in order to fix this, while still avoiding deadlocks in the case where
 the fiemap buffer is memory mapped to the same file, change fiemap to work
index cc59546961c746030cea19e317793b8fe15195f8..bd2d64e2392524db7e9e12d06db7ab93782a1e36 100644 (file)
@@ -7,16 +7,16 @@ From: Chao Yu <chao@kernel.org>
 
 [ Upstream commit 40b2d55e045222dd6de2a54a299f682e0f954b03 ]
 
-generic/700       - output mismatch (see /media/fstests/results//generic/700.out.bad)
-    --- tests/generic/700.out  2023-03-28 10:40:42.735529223 +0000
-    +++ /media/fstests/results//generic/700.out.bad    2024-02-06 04:37:56.000000000 +0000
-    @@ -1,2 +1,4 @@
-     QA output created by 700
-    +/mnt/scratch_f2fs/f1: security.selinux: No such attribute
-    +/mnt/scratch_f2fs/f2: security.selinux: No such attribute
-     Silence is golden
-    ...
-    (Run 'diff -u /media/fstests/tests/generic/700.out /media/fstests/results//generic/700.out.bad'  to see the entire diff)
+#generic/700       - output mismatch (see /media/fstests/results//generic/700.out.bad)
+#    --- tests/generic/700.out 2023-03-28 10:40:42.735529223 +0000
+#    +++ /media/fstests/results//generic/700.out.bad   2024-02-06 04:37:56.000000000 +0000
+#    @@ -1,2 +1,4 @@
+#     QA output created by 700
+#    +/mnt/scratch_f2fs/f1: security.selinux: No such attribute
+#    +/mnt/scratch_f2fs/f2: security.selinux: No such attribute
+#     Silence is golden
+#    ...
+#    (Run 'diff -u /media/fstests/tests/generic/700.out /media/fstests/results//generic/700.out.bad'  to see the entire diff)
 
 HINT: You _MAY_ be missing kernel fix:
       70b589a37e1a xfs: add selinux labels to whiteout inodes