diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-10-20 18:27:33 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-10-20 18:27:33 -1000 |
| commit | 2c455ddca7827ad8fa3a64fdbf5a60efb928b46a (patch) | |
| tree | e293ffebfeafd31158c4f1de2204c52d65172074 /Documentation/networking/net_cachelines | |
| parent | 72a16bcff25e9f4a1d6d42a243301b1b76db2f32 (diff) | |
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>
Diffstat (limited to 'Documentation/networking/net_cachelines')
0 files changed, 0 insertions, 0 deletions
