On Tue, Jul 08, 2025 at 02:23:53PM +0200, Stefan Metzmacher wrote:
Hi,
any reason why this is only backported to 6.12, but not 6.15?
Looks like Sasha's scripts missed them, thanks for catching. We need to run the "what patches are only in older trees" script again one of these days to sweep all of these up...
I'm looking at v6.15.5 and v6.12.36 and the following are missing from 6.15:
bced02aca343 David Howells Wed Apr 2 20:27:26 2025 +0100 cifs: Fix reading into an ITER_FOLIOQ from the smbdirect code 87dcc7e33fc3 David Howells Wed Jun 25 14:15:04 2025 +0100 cifs: Fix the smbd_response slab to allow usercopy b8ddcca4391e Stefan Metzmacher Wed May 28 18:01:40 2025 +0200 smb: client: make use of common smbdirect_socket_parameters 69cafc413c2d Stefan Metzmacher Wed May 28 18:01:39 2025 +0200 smb: smbdirect: introduce smbdirect_socket_parameters c39639bc7723 Stefan Metzmacher Wed May 28 18:01:37 2025 +0200 smb: client: make use of common smbdirect_socket f4b05342c293 Stefan Metzmacher Wed May 28 18:01:36 2025 +0200 smb: smbdirect: add smbdirect_socket.h a6ec1fcafd41 Stefan Metzmacher Wed May 28 18:01:33 2025 +0200 smb: smbdirect: add smbdirect.h with public structures 6509de31b1b6 Stefan Metzmacher Wed May 28 18:01:31 2025 +0200 smb: client: make use of common smbdirect_pdu.h a9bb4006c4f3 Stefan Metzmacher Wed May 28 18:01:30 2025 +0200 smb: smbdirect: add smbdirect_pdu.h with protocol definitions
With these being backported to 6.15 too, the following is missing in both:
commit 1944f6ab4967db7ad8d4db527dceae8c77de76e9 Author: Stefan Metzmacher metze@samba.org AuthorDate: Wed Jun 25 10:16:38 2025 +0200 Commit: Steve French stfrench@microsoft.com CommitDate: Wed Jun 25 11:12:54 2025 -0500
smb: client: let smbd_post_send_iter() respect the peers max_send_size and transmit all dataAs it was marked as Cc: stable+noautosel@kernel.org # sp->max_send_size should be info->max_send_size in backports
But now that the patches up to b8ddcca4391e are backported it can be cherry-picked just fine to both branches.
Ok, will do. I think I might have dropped these from 6.15 previously as the "noautosel" tag threw me...
thanks,
greg k-h