summaryrefslogtreecommitdiff
path: root/fs/ocfs2/stackglue.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-17 12:29:16 +0200
committerIngo Molnar <mingo@kernel.org>2019-06-17 12:29:16 +0200
commitbddb3636737f658886a0a02b64db5366bba3428e (patch)
tree8f7ffcb42803fa0bb3378ef969545e4a5e57262c /fs/ocfs2/stackglue.h
parent3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (diff)
parentcbb99c0f588737ec98c333558922ce47e9a95827 (diff)
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ocfs2/stackglue.h')
-rw-r--r--fs/ocfs2/stackglue.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/ocfs2/stackglue.h b/fs/ocfs2/stackglue.h
index f2dce10fae543..e9d26cbeb3b82 100644
--- a/fs/ocfs2/stackglue.h
+++ b/fs/ocfs2/stackglue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/* -*- mode: c; c-basic-offset: 8; -*-
* vim: noexpandtab sw=8 ts=8 sts=0:
*
@@ -6,15 +7,6 @@
* Glue to the underlying cluster stack.
*
* Copyright (C) 2007 Oracle. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
*/