summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-03 12:30:12 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-03 12:30:12 +0100
commit294cbd05e32990c3b1a62be27441fc719edebbab (patch)
tree9e543bcfdaa183343f18714a256d3fd5c88d3b5c /fs/gfs2/Makefile
parentperf/cgroup: Fix perf cgroup hierarchy support (diff)
parentKbuild: don't pass "-C" to preprocessor when processing linker scripts (diff)
downloadlinux-294cbd05e32990c3b1a62be27441fc719edebbab.tar.xz
linux-294cbd05e32990c3b1a62be27441fc719edebbab.zip
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/gfs2/Makefile')
-rw-r--r--fs/gfs2/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/gfs2/Makefile b/fs/gfs2/Makefile
index 86128202384f..41b2aa4bc3bf 100644
--- a/fs/gfs2/Makefile
+++ b/fs/gfs2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
ccflags-y := -I$(src)
obj-$(CONFIG_GFS2_FS) += gfs2.o
gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \