From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Feb 2019 01:48:50 +0000 (-0800)
Subject: Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri... 
X-Git-Tag: v5.0-rc8~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cb268d806972c76c34e5d74343fb6064cd722c7c;p=users%2Fdwmw2%2Flinux.git

Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

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

cb268d806972c76c34e5d74343fb6064cd722c7c