* linux-next: manual merge of the vfs-brauner tree with the cifs tree @ 2024-09-12 22:59 ` Stephen Rothwell 2024-09-13 7:34 ` [EXTERNAL] " David Howells 0 siblings, 1 reply; 2+ messages in thread From: Stephen Rothwell @ 2024-09-12 22:59 UTC (permalink / raw) To: Christian Brauner, Steve French Cc: David Howells, CIFS, Linux Kernel Mailing List, Linux Next Mailing List, Steve French [-- Attachment #1: Type: text/plain, Size: 792 bytes --] Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/smb/client/cifsencrypt.c between commit: 192bbbf2bd41 ("cifs: Fix signature miscalculation") from the cifs tree and commits: 4aa571d67e81 ("cifs: Don't support ITER_XARRAY") from the vfs-brauner tree. I fixed it up (the latter removed the line update by the former, so I just use latter version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [EXTERNAL] linux-next: manual merge of the vfs-brauner tree with the cifs tree 2024-09-12 22:59 ` linux-next: manual merge of the vfs-brauner tree with the cifs tree Stephen Rothwell @ 2024-09-13 7:34 ` David Howells 0 siblings, 0 replies; 2+ messages in thread From: David Howells @ 2024-09-13 7:34 UTC (permalink / raw) To: Steven French Cc: dhowells, Stephen Rothwell, Christian Brauner, smfrench, CIFS, Linux Kernel Mailing List, Linux Next Mailing List Steven French <Steven.French@microsoft.com> wrote: > Additional context: "cifs: Fix signature miscalculation" is fairly urgent > since fixes a regression so plan to send that one upstream ASAP The bug doesn't exist in Christian's vfs.netfs branch as the code was replaced and ITER_XARRAY is no longer used there. David ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-13 7:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <BL1PR21MB3088765BBE2F16AD813917AFE4642@BL1PR21MB3088.namprd21.prod.outlook.com>
2024-09-12 22:59 ` linux-next: manual merge of the vfs-brauner tree with the cifs tree Stephen Rothwell
2024-09-13 7:34 ` [EXTERNAL] " David Howells
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®