summaryrefslogtreecommitdiff
path: root/ipc/mq_sysctl.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 14:29:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 14:29:03 +0300
commit90b45399b4418a3542fe096b92840b3bf235e78e (patch)
treea75e3e37503be4fe4c7d718248bd5a844c8705e1 /ipc/mq_sysctl.c
parente39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
downloadlinux-90b45399b4418a3542fe096b92840b3bf235e78e.tar.xz
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'ipc/mq_sysctl.c')
-rw-r--r--ipc/mq_sysctl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
index 68d4e953762c..7c00f28923a8 100644
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (C) 2007 IBM Corporation
*
* Author: Cedric Le Goater <clg@fr.ibm.com>
- *
- * 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/nsproxy.h>