aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/git-resolve.sh
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2025-06-05 02:23:37 +0000
committerLinus Torvalds <[email protected]>2025-06-05 02:23:37 +0000
commitd2fec01e89447729c7b9d722a8e7ef9d1184c7be (patch)
treea8a88c40718a2e53a50356ba85e0a52712a41794 /scripts/git-resolve.sh
parentMerge tag 'bcachefs-2025-06-04' of git://evilpiepirate.org/bcachefs (diff)
parentksmbd: allow a filename to contain special characters on SMB3.1.1 posix exten... (diff)
downloadkernel-d2fec01e89447729c7b9d722a8e7ef9d1184c7be.tar.gz
kernel-d2fec01e89447729c7b9d722a8e7ef9d1184c7be.zip
Merge tag '6.16-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd
Pull smb server updates from Steve French: "Four smb3 server fixes: - Fix for special character handling when mounting with "posix" - Fix for mounts from Mac for fs that don't provide unique inode numbers - Two cleanup patches (e.g. for crypto calls)" * tag '6.16-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd: ksmbd: allow a filename to contain special characters on SMB3.1.1 posix extension ksmbd: provide zero as a unique ID to the Mac client ksmbd: remove unnecessary softdep on crc32 ksmbd: use SHA-256 library API instead of crypto_shash API
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions