Merge commit 'keys-fixes-20170927' into fixes-v4.14-rc3
commit2569e7e1d684e418ba7ffc9d0ad9a5f5247df0a0
authorJames Morris <james.l.morris@oracle.com>
Wed, 27 Sep 2017 23:11:28 +0000 (28 09:11 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 27 Sep 2017 23:11:28 +0000 (28 09:11 +1000)
tree61ed98d4a5c453dca511c548213d364ce75711d0
parent9cd6681cb1169e815c41af0265165dd1b872f228
parent428490e38b2e352812e0b765d8bceafab0ec441d
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."