summaryrefslogtreecommitdiffstats
path: root/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-29 16:33:44 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-29 16:33:44 +0200
commit0c9c09e2873354ef28a3b5a74acd8884292e6fc4 (patch)
tree49fea2bb89fee2d6afa95b70753db38535e9f4eb /0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch
parentb882163f98fbb3dcc9ff5d494827ea4abbaf7a12 (diff)
parent68dd5fcadc5b702c7d1426dea990ff0b55e62f42 (diff)
downloadkernel-0c9c09e2873354ef28a3b5a74acd8884292e6fc4.tar.gz
kernel-0c9c09e2873354ef28a3b5a74acd8884292e6fc4.tar.xz
kernel-0c9c09e2873354ef28a3b5a74acd8884292e6fc4.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch')
-rw-r--r--0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch b/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch
new file mode 100644
index 000000000..96ff5ff88
--- /dev/null
+++ b/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch
@@ -0,0 +1,35 @@
+From 317ddf3715cd4083e0e5914c17e897e72e779445 Mon Sep 17 00:00:00 2001
+From: Nishad Kamdar <nishadkamdar@gmail.com>
+Date: Sun, 19 Apr 2020 20:06:44 +0530
+Subject: [PATCH] btrfs: discard: Use the correct style for SPDX License
+ Identifier
+
+This patch corrects the SPDX License Identifier style in header file
+related to Btrfs File System support. For C header files
+Documentation/process/license-rules.rst mandates C-like comments
+(opposed to C source files where C++ style should be used).
+
+Changes made by using a script provided by Joe Perches here:
+https://lkml.org/lkml/2019/2/7/46.
+
+Suggested-by: Joe Perches <joe@perches.com>
+Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ fs/btrfs/discard.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/discard.h b/fs/btrfs/discard.h
+index 21a15776dac4..353228d62f5a 100644
+--- a/fs/btrfs/discard.h
++++ b/fs/btrfs/discard.h
+@@ -1,4 +1,4 @@
+-// SPDX-License-Identifier: GPL-2.0
++/* SPDX-License-Identifier: GPL-2.0 */
+
+ #ifndef BTRFS_DISCARD_H
+ #define BTRFS_DISCARD_H
+--
+2.26.2
+