From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Apr 2024 22:31:56 +0000 (-0700)
Subject: Merge tag '9p-for-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Tag: v6.10-rc5-pxa1908~513
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=dda89e2fbc5b7702296356b4a20a5cb66c70e426;p=linux.git

Merge tag '9p-for-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Pull 9p fix from Eric Van Hensbergen:
 "This contains a single mitigation to help deal with an apparent race
  condition between client and server having to deal with inode number
  collisions"

* tag '9p-for-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: mitigate inode collisions
---

dda89e2fbc5b7702296356b4a20a5cb66c70e426