diff options
| author | David S. Miller | 2019-06-07 20:00:14 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-06-07 20:00:14 +0200 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /security/integrity/ima/ima_kexec.c | |
| parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/integrity/ima/ima_kexec.c')
| -rw-r--r-- | security/integrity/ima/ima_kexec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index d6f32807b347..9e94eca48b89 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 IBM Corporation * * Authors: * Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> * Mimi Zohar <zohar@linux.vnet.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; either version 2 of the License, or - * (at your option) any later version. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |