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

[linux-block.git] / fs / proc_namespace.c

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 03afd51509162feaed7fd9d3eae196acd9f08522..7b635d17321377e4868554a6ad338a1bd413b3cc 100644 (file)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fs/proc_namespace.c - handling of /proc/<pid>/{mounts,mountinfo,mountstats}
  *