Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Fri, 24 Nov 2017 00:54:11 +0000 (11:54 +1100)
committerJames Morris <james.l.morris@oracle.com>
Fri, 24 Nov 2017 00:54:11 +0000 (11:54 +1100)
commitce44cd8dfc55110fa7423ceb47a8a70dac65fe89
tree632da275c702e37c9fbad5791ca6455242bb1177
parent5a787756b809888e8925d722862167f1229b58f7
parent1e684d3820d8f72d877c0adb521ae17c6fc9bc88
Merge tag 'keys-next-20171123' of git://git./linux/kernel/git/dhowells/linux-fs into next-keys

Merge keys subsystem changes from David Howells, for v4.15.