Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5
authorJames Morris <james.l.morris@oracle.com>
Thu, 19 Oct 2017 01:28:38 +0000 (12:28 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 19 Oct 2017 01:28:38 +0000 (12:28 +1100)

Trivial merge