From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jul 2017 18:11:13 +0000 (-0700)
Subject: Merge tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v6.6-pxa1908~16189
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=15b0a8d1d45a116cbd03d41fd066285ac8ecd3b4;p=linux.git

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
---

15b0a8d1d45a116cbd03d41fd066285ac8ecd3b4