By the way, I'm moving this weekend and may be particularly unresponsive for several days while we pack, unpack, clean the old place, etc., etc. (And I'm therefore particularly grateful that Chuck's handling nfsd patches for 5.7. Please make sure you're including Chuck on any nfsd patches.) --b. On Thu, Mar 05, 2020 at 12:55:03PM -0500, Chuck Lever wrote: > Hey- > > I've collected NFSD-related patches for the v5.7 merge window in this topic branch: > > https://git.linux-nfs.org/?p=cel/cel-2.6.git;a=shortlog;h=refs/heads/nfsd-5.7-testing > > The only remaining items are Trond's change to the server to drop requests, > and a possible change to the SSC CONFIG dependency to disable it when NFS_FS=m. > > There was one minor merge conflict, between: > > "fs: nfsd: nfs4state.c: Use built-in RCU list checking" > > and > > "SUNRPC/cache: Allow garbage collection of invalid cache entries" > > Trond, please confirm that I resolved the conflict correctly. Thanks! > > -- > Chuck Lever >
