summaryrefslogtreecommitdiffstats
path: root/security/apparmor/secid.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-06-18 19:12:47 +0100
committerMark Brown <broonie@kernel.org>2019-06-18 19:12:47 +0100
commite1d700f7c94e755106749411706a38e39a93404b (patch)
treeb1230cb7eba5a4ef28ed2cd2527d9ac78f06cc00 /security/apparmor/secid.c
parentba576a6232dc06605f4edfaeea9b526ba7724f84 (diff)
parentd1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff)
downloadtalos-op-linux-e1d700f7c94e755106749411706a38e39a93404b.tar.gz
talos-op-linux-e1d700f7c94e755106749411706a38e39a93404b.zip
Merge tag 'v5.2-rc4' into regulator-5.3
Linux 5.2-rc4
Diffstat (limited to 'security/apparmor/secid.c')
-rw-r--r--security/apparmor/secid.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/security/apparmor/secid.c b/security/apparmor/secid.c
index 05373d9a3d6a..ce545f99259e 100644
--- a/security/apparmor/secid.c
+++ b/security/apparmor/secid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* AppArmor security module
*
@@ -5,12 +6,6 @@
*
* Copyright 2009-2017 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.
- *
- *
* AppArmor allocates a unique secid for every label used. If a label
* is replaced it receives the secid of the label it is replacing.
*/
OpenPOWER on IntegriCloud