Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Wed, 19 Apr 2017 12:00:15 +0000 (22:00 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 19 Apr 2017 12:00:15 +0000 (22:00 +1000)

Trivial merge