diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-09-28 02:11:28 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-09-28 02:11:28 +0300 |
| commit | 2569e7e1d684e418ba7ffc9d0ad9a5f5247df0a0 (patch) | |
| tree | 61ed98d4a5c453dca511c548213d364ce75711d0 /arch/x86/kernel/.gitignore | |
| parent | 9cd6681cb1169e815c41af0265165dd1b872f228 (diff) | |
| parent | 428490e38b2e352812e0b765d8bceafab0ec441d (diff) | |
| download | linux-2569e7e1d684e418ba7ffc9d0ad9a5f5247df0a0.tar.xz | |
Merge commit 'keys-fixes-20170927' into fixes-v4.14-rc3
From David Howells:
"There are two sets of patches here:
(1) A bunch of core keyrings bug fixes from Eric Biggers.
(2) Fixing big_key to use safe crypto from Jason A. Donenfeld."
Diffstat (limited to 'arch/x86/kernel/.gitignore')
0 files changed, 0 insertions, 0 deletions