From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Apr 2024 19:07:37 +0000 (-0700)
Subject: Merge tag 'nfs-for-6.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v6.9-rc7~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e4bc4bcae012c98964c3c2010debfbd9e5b229f;p=thirdparty%2Fkernel%2Flinux.git

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
---

9e4bc4bcae012c98964c3c2010debfbd9e5b229f