]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a2e230 24457f1)
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)
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

1  2 
fs/nfs/inode.c patch | diff1 | diff2 | blob | history
net/sunrpc/xprtsock.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/inode.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.