Sync to v4.15-rc3 for security subsystem developers to work against.
authorJames Morris <james.l.morris@oracle.com>
Mon, 11 Dec 2017 06:01:08 +0000 (17:01 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 11 Dec 2017 06:01:08 +0000 (17:01 +1100)

Trivial merge