From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Apr 2025 22:35:46 +0000 (-0700)
Subject: Merge tag '9p-for-6.15-rc1' of https://github.com/martinetd/linux
X-Git-Tag: nvme-6.15-2025-04-10~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bdafff62ae028e4d399751b0b6f26d76dbad6b62;p=nvme.git

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

Pull 9p updates from Dominique Martinet:

 - fix handling of bogus (negative/too long) replies

 - fix crash on mkdir with ACLs (... looks like nobody is using ACLs
   with semi-recent kernels...)

 - ipv6 support for trans=tcp

 - minor concurrency fix to make syzbot happy

 - minor cleanup

* tag '9p-for-6.15-rc1' of https://github.com/martinetd/linux:
  docs: fs/9p: Add missing "not" in cache documentation
  9p: Use hashtable.h for hash_errmap
  Documentation/fs/9p: fix broken link
  9p/trans_fd: mark concurrent read and writes to p9_conn->err
  9p/net: return error on bogus (longer than requested) replies
  9p/net: fix improper handling of bogus negative read/write replies
  fs/9p: fix NULL pointer dereference on mkdir
  net/9p/fd: support ipv6 for trans=tcp
---

bdafff62ae028e4d399751b0b6f26d76dbad6b62