Merge remote-tracking branch 'vfs-fixes/fixes'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 21:03:48 +0000 (08:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 21:03:48 +0000 (08:03 +1100)

Trivial merge