From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Oct 2024 22:25:02 +0000 (-0700)
Subject: Merge tag '9p-for-6.12-rc5' of https://github.com/martinetd/linux
X-Git-Tag: microblaze-v6.16~814
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=6.12.0-rc4-g850925a8133c;p=linux-2.6-microblaze.git

Merge tag '9p-for-6.12-rc5' of https://github.com/martinetd/linux

Pull more 9p reverts from Dominique Martinet:
 "Revert patches causing inode collision problems.

  The code simplification introduced significant regressions on servers
  that do not remap inode numbers when exporting multiple underlying
  filesystems with colliding inodes. See the top-most revert (commit
  be2ca3825372) for details.

  This problem had been ignored for too long and the reverts will also
  head to stable (6.9+).

  I'm confident this set of patches gets us back to previous behaviour
  (another related patch had already been reverted back in April and
  we're almost back to square 1, and the rest didn't touch inode
  lifecycle)"

* tag '9p-for-6.12-rc5' of https://github.com/martinetd/linux:
  Revert "fs/9p: simplify iget to remove unnecessary paths"
  Revert "fs/9p: fix uaf in in v9fs_stat2inode_dotl"
  Revert "fs/9p: remove redundant pointer v9ses"
  Revert " fs/9p: mitigate inode collisions"
---

850925a8133c73c4a2453c360b2c3beb3bab67c9