Merge tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jul 2017 18:11:13 +0000 (11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jul 2017 18:11:13 +0000 (11:11 -0700)
commit15b0a8d1d45a116cbd03d41fd066285ac8ecd3b4
treef6acd2cdbf24ab8cc0ff891e87eb249f88289214
parentcb8c65ccff7f77d0285f1b126c72d37b2572c865
parenteff793687792d3eed594d147aceef2000fb9ca3d
Merge tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux

Pull nfsd fix from Bruce Fields:
 "One fix for a problem introduced in the most recent merge window and
  found by Dave Jones and KASAN"

* tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix a memory scribble in the callback channel