diff options
| author | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
| commit | 23da766ab1dc005860b675bf048226a11a748bf9 (patch) | |
| tree | 3f8dbfc2cf68f5da3faa3a377087b06dd8ad343d /security/integrity/evm/evm_secfs.c | |
| parent | sched/fair: Remove sgs->sum_weighted_load (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.gz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.xz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.zip | |
Merge tag 'v5.2-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/integrity/evm/evm_secfs.c')
| -rw-r--r-- | security/integrity/evm/evm_secfs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c index 3f7cbb238923..c11c1f7b3ddd 100644 --- a/security/integrity/evm/evm_secfs.c +++ b/security/integrity/evm/evm_secfs.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2010 IBM Corporation * * Authors: * Mimi Zohar <zohar@us.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. - * * File: evm_secfs.c * - Used to signal when key is on keyring * - Get the key and enable EVM |