]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'v7.1-rc1-part2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2026 02:14:55 +0000 (19:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2026 02:14:55 +0000 (19:14 -0700)
Pull smb client updates from Steve French:

 - Fix integer underflow in encrypted read

 - Four debug patches, adding a few tracepoints

 - Minor update to MAINTAINERS file (preferred server URL for cifs)

 - Remove the BUG_ON() calls in d_mark_tmpfile_name

* tag 'v7.1-rc1-part2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  MAINTAINERS: change git.samba.org to https
  smb: client: fix integer underflow in receive_encrypted_read()
  smb: client: add tracepoints for deferred handle caching
  smb: client: add oplock level to smb3_open_done tracepoint
  smb: client: add tracepoint for local lock conflicts
  smb: client: add tracepoints for lock operations
  vfs: get rid of BUG_ON() in d_mark_tmpfile_name()

1  2 
MAINTAINERS
fs/smb/client/file.c
fs/smb/client/smb2pdu.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge