diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-23 04:07:52 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 04:07:52 +0300 |
| commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
| tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /kernel | |
| parent | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (diff) | |
| parent | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (diff) | |
| download | linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.xz | |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/.gitignore | 1 | ||||
| -rw-r--r-- | kernel/module_signing.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/kernel/.gitignore b/kernel/.gitignore index 790d83c7d160..b3097bde4e9c 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -5,4 +5,3 @@ config_data.h config_data.gz timeconst.h hz.bc -x509_certificate_list diff --git a/kernel/module_signing.c b/kernel/module_signing.c index bd62f5cda746..6528a79d998d 100644 --- a/kernel/module_signing.c +++ b/kernel/module_signing.c @@ -10,6 +10,7 @@ */ #include <linux/kernel.h> +#include <linux/errno.h> #include <keys/system_keyring.h> #include <crypto/public_key.h> #include "module-internal.h" |