From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Apr 2024 16:31:06 +0000 (-0700)
Subject: Merge tag 'nfsd-6.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
X-Git-Tag: v6.10-rc5-pxa1908~516
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e33c4963bf536900f917fb65a687724d5539bc21;p=linux.git

Merge tag 'nfsd-6.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull nfsd fixes from Chuck Lever:

 - Revert some backchannel fixes that went into v6.9-rc

* tag 'nfsd-6.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  Revert "NFSD: Convert the callback workqueue to use delayed_work"
  Revert "NFSD: Reschedule CB operations when backchannel rpc_clnt is shut down"
---

e33c4963bf536900f917fb65a687724d5539bc21