From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Mar 2026 16:07:29 +0000 (-0700)
Subject: Merge tag 'v7.0-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v7.0-rc5~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7006433ca2de80e4aa7d11dceb3124335cff5a43;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'v7.0-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull smb client fixes from Steve French:

 - Fix reporting of i_blocks

 - Fix Kerberos mounts with different usernames to same server

 - Trivial comment cleanup

* tag 'v7.0-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb: client: fix generic/694 due to wrong ->i_blocks
  cifs: smb1: fix comment typo
  smb: client: fix krb5 mount with username option
---

7006433ca2de80e4aa7d11dceb3124335cff5a43