tree 61ed98d4a5c453dca511c548213d364ce75711d0
parent 9cd6681cb1169e815c41af0265165dd1b872f228
parent 428490e38b2e352812e0b765d8bceafab0ec441d
author James Morris <james.l.morris@oracle.com> 1506553888 +1000
committer James Morris <james.l.morris@oracle.com> 1506553888 +1000

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."