From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Dec 2024 17:32:24 +0000 (-0800)
Subject: Merge tag 'nfs-for-6.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v6.13-rc4~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a5da3f5d35000bd8e5dd78732679a1e00fae719;p=thirdparty%2Flinux.git

Merge tag 'nfs-for-6.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client fixes from Trond Myklebust:

 - NFS/pnfs: Fix a live lock between recalled layouts and layoutget

 - Fix a build warning about an undeclared symbol 'nfs_idmap_cache_timeout'

* tag 'nfs-for-6.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  fs/nfs: fix missing declaration of nfs_idmap_cache_timeout
  NFS/pnfs: Fix a live lock between recalled layouts and layoutget
---

4a5da3f5d35000bd8e5dd78732679a1e00fae719