Re: linux-next: manual merge of the nfsd tree with the nfs-anna tree

[Chuck Lever]

On Tue, Sep 22, 2026, at 4:42 AM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the nfsd tree got a conflict in:
>
>   net/sunrpc/svcsock.c
>
> between commits:
>
>   2ecf0d2af5da8 ("SUNRPC: resume receiving after a TLS control record")
>   1a485d8e93a92 ("SUNRPC: treat every TLS error alert as fatal")
>   d3b4fb1d30749 ("SUNRPC: reject a TLS alert record that is not two 
> octets")
>   f547743e6b51f ("SUNRPC: do not credit control-record octets to the 
> RPC stream")
>
> from the nfs-anna tree and commits:
>
>   a76d52a01792f ("SUNRPC: Do not credit control-record octets to the 
> RPC stream")
>   e263b5d674fcf ("SUNRPC: Reject a TLS alert record that is not two 
> octets")
>   ebcbe4a9a7779 ("SUNRPC: Treat every TLS error alert as fatal")
>   8f765d820c590 ("SUNRPC: Resume receiving after a TLS control record")
>   7f757c41a8beb ("SUNRPC: Reject a socket that already has an svc_sock 
> attached")
>   35ab7140c7bfa ("SUNRPC: Separate the TLS control-record receive from 
> its policy")
>   9a4ef884d00cd ("SUNRPC: Close the transport on an unhandled TLS 
> record type")
>   eaef7075c6a48 ("SUNRPC: Flush a received record's pages once it is 
> complete")
>   1517c61f247f3 ("SUNRPC: Receive RPC records with ->read_sock")
>   23bec0f9631c2 ("SUNRPC: Bypass sock_recvmsg() for the TLS 
> control-record receive")
>   0fce57f554fa6 ("SUNRPC: Skip xpt_reserved accounting for non-UDP 
> transports")
>
> from the nfsd tree.  This looks like different versions of patches being
> applied with extra stuff then stacked on top.  I've taken the nfsd
> version but it's possible that's gone wrong, I'm not *super* confident
> in this.  It feels like there's a coordination issue here.

I didn't realize Anna had picked up the TLS-related work. To resolve
these conflicts:

- I can drop the xprtsock.c three (91bdf2ae4a27, 6b91817001fb,
  21bcc6ccc6cd) from nfsd-next

- I need to keep the svcsock.c four, as there is follow-on work in
  the NFSD queue that depends on those

Anna, can you drop f547743e6b51, d3b4fb1d3074, 1a485d8e93a9,
2ecf0d2af5da from nfs-anna?


-- 
Chuck Lever (Come to NFS bake-a-thon! https://nfsv4bat.org)