Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 23:01:33 +0000 (10:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 23:01:33 +0000 (10:01 +1100)

Trivial merge