summaryrefslogtreecommitdiffstats
path: root/security/apparmor/match.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-17 12:00:22 +0200
committerIngo Molnar <mingo@kernel.org>2019-06-17 12:00:22 +0200
commit7b347ad4938ddca1a22b983e36b9ef825a72d230 (patch)
tree93b6262da516cda28465a8dc0c4a6a95525cbbd8 /security/apparmor/match.c
parent9db9b76767f133d0e1ce19f01117c83221641899 (diff)
parent9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff)
downloadtalos-op-linux-7b347ad4938ddca1a22b983e36b9ef825a72d230.tar.gz
talos-op-linux-7b347ad4938ddca1a22b983e36b9ef825a72d230.zip
Merge tag 'v5.2-rc5' into x86/asm, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/apparmor/match.c')
-rw-r--r--security/apparmor/match.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 55f2ee505a01..6ccd3734a841 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* AppArmor security module
*
@@ -5,11 +6,6 @@
*
* Copyright (C) 1998-2008 Novell/SUSE
* Copyright 2009-2012 Canonical Ltd.
- *
- * 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 of the
- * License.
*/
#include <linux/errno.h>
OpenPOWER on IntegriCloud