summaryrefslogtreecommitdiff
path: root/include/uapi/linux/bfs_fs.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-08 05:11:56 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-08 05:11:56 +0300
commit0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch)
treef0aa64e956d1d2addb2263ddcd238e9f014b36a0 /include/uapi/linux/bfs_fs.h
parent4e974c120039e35b90d2cb0459452bd9a6a71594 (diff)
parent39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff)
downloadlinux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge problems when some header files get deleted.
Diffstat (limited to 'include/uapi/linux/bfs_fs.h')
-rw-r--r--include/uapi/linux/bfs_fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/bfs_fs.h b/include/uapi/linux/bfs_fs.h
index 1c0b355aa515..73445ef07dda 100644
--- a/include/uapi/linux/bfs_fs.h
+++ b/include/uapi/linux/bfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
/*
* include/linux/bfs_fs.h - BFS data structures on disk.
* Copyright (C) 1999 Tigran Aivazian <tigran@veritas.com>