* RFC: v5.7 NFSD merge candidate
@ 2020-03-05 17:55 Chuck Lever
2020-03-05 21:41 ` Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: Chuck Lever @ 2020-03-05 17:55 UTC (permalink / raw)
To: Bruce Fields, Trond Myklebust; +Cc: Linux NFS Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: RFC: v5.7 NFSD merge candidate
2020-03-05 17:55 RFC: v5.7 NFSD merge candidate Chuck Lever
@ 2020-03-05 21:41 ` Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Fields @ 2020-03-05 21:41 UTC (permalink / raw)
To: Chuck Lever; +Cc: Trond Myklebust, Linux NFS Mailing List
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-05 21:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-05 17:55 RFC: v5.7 NFSD merge candidate Chuck Lever
2020-03-05 21:41 ` Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).