Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Feb 2019 01:48:50 +0000 (17:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Feb 2019 01:48:50 +0000 (17:48 -0800)
Pull keys fixes from James Morris:
 "Two fixes from Eric Biggers"

* 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: always initialize keyring_index_key::desc_len
  KEYS: user: Align the payload buffer


Trivial merge