Commit 2c455ddca782 for kernel

commit 2c455ddca7827ad8fa3a64fdbf5a60efb928b46a
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Oct 20 18:27:33 2026 -1000

    smb client: fix mis-merge with fileattr_set taking a const idmap

    The danger of doing the merge window while on vacation and traveling
    with just the laptop: I only do full builds a couple of times a day
    because they are so slow on my poor little laptop.

    As a result, I missed the conflict between the newly added smb client
    fileattr_set function (commit 273913b7c33a: "smb: client: implement
    fileattr_set for compression flags") and the vfs layer having in the
    meantime made the idmap argument 'const' (commit 025756ee7b47: "fs: port
    mnt_idmap() and file_mnt_idmap() to const mnt_idmap")

    Mea culpa.

    Fixes: 32543b09681a ("Merge tag 'cifs-for-7.4' of https://git.manguebit.org/linux")
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/smb/client/cifsfs.h b/fs/smb/client/cifsfs.h
index 7600467babb6..e54d3798eb2f 100644
--- a/fs/smb/client/cifsfs.h
+++ b/fs/smb/client/cifsfs.h
@@ -91,7 +91,7 @@ extern const struct inode_operations cifs_namespace_inode_operations;

 struct file_kattr;
 int cifs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);
-int cifs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,
+int cifs_fileattr_set(const struct mnt_idmap *idmap, struct dentry *dentry,
 		      struct file_kattr *fa);


diff --git a/fs/smb/client/ioctl.c b/fs/smb/client/ioctl.c
index af4664f5b120..bb8808289a46 100644
--- a/fs/smb/client/ioctl.c
+++ b/fs/smb/client/ioctl.c
@@ -181,7 +181,7 @@ static int cifs_set_compression(unsigned int xid, struct dentry *dentry,
 					    compression_state);
 }

-int cifs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,
+int cifs_fileattr_set(const struct mnt_idmap *idmap, struct dentry *dentry,
 		      struct file_kattr *fa)
 {
 	struct cifs_sb_info *cifs_sb = CIFS_SB(dentry);