Merge branch 'linus' into locking/core, to resolve conflicts

[sfrench/cifs-2.6.git] / fs / fs_pin.c

diff --git a/fs/fs_pin.c b/fs/fs_pin.c
index 2d07f292b62567c952e39e3a79113ab45824882b..a6497cf8ae53aa2bc7dcc2996887fcb92f1e9820 100644 (file)
--- a/fs/fs_pin.c
+++ b/fs/fs_pin.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/slab.h>