From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jul 2024 15:16:18 +0000 (-0700)
Subject: Merge tag '6.10-rc6-smb3-server-fixes' of git://git.samba.org/ksmbd
X-Git-Tag: nvme-6.11-2024-08-08~213
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=34afb82a3c67f869267a26f593b6f8fc6bf35905;p=nvme.git

Merge tag '6.10-rc6-smb3-server-fixes' of git://git.samba.org/ksmbd

Pull smb server fixes from Steve French:

 - fix access flags to address fuse incompatibility

 - fix device type returned by get filesystem info

* tag '6.10-rc6-smb3-server-fixes' of git://git.samba.org/ksmbd:
  ksmbd: discard write access to the directory open
  ksmbd: return FILE_DEVICE_DISK instead of super magic
---

34afb82a3c67f869267a26f593b6f8fc6bf35905