Merge tag 'nfs-for-6.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Apr 2024 19:07:37 +0000 (12:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Apr 2024 19:07:37 +0000 (12:07 -0700)
commit9e4bc4bcae012c98964c3c2010debfbd9e5b229f
treef38ac6f09ea64a56866cf3b62f47269082343ff4
parent0a2e230514c5f1b09630bab94e457e930ced4cf0
parent24457f1be29f1e7042e50a7749f5c2dde8c433c8
Merge tag 'nfs-for-6.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client fixes from Trond Myklebust:

 - Fix an Oops in xs_tcp_tls_setup_socket

 - Fix an Oops due to missing error handling in nfs_net_init()

* tag 'nfs-for-6.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: Handle error of rpc_proc_register() in nfs_net_init().
  SUNRPC: add a missing rpc_stat for TCP TLS
fs/nfs/inode.c
net/sunrpc/xprtsock.c