From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>,
Steve French <smfrench@gmail.com>
Cc: David Howells <dhowells@redhat.com>,
CIFS <linux-cifs@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Steve French <stfrench@microsoft.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the cifs tree
Date: Fri, 13 Sep 2024 08:59:45 +1000 [thread overview]
Message-ID: <20240913085945.40e7accf@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2024-09-12 22:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 22:59 Stephen Rothwell [this message]
[not found] ` <BL1PR21MB3088765BBE2F16AD813917AFE4642@BL1PR21MB3088.namprd21.prod.outlook.com>
2024-09-13 7:34 ` [EXTERNAL] linux-next: manual merge of the vfs-brauner tree with the cifs tree David Howells
-- strict thread matches above, loose matches on Subject: below --
2024-09-06 1:18 Stephen Rothwell
2024-09-05 22:46 Stephen Rothwell
2024-09-05 23:38 ` Stephen Rothwell
2024-09-06 1:48 ` Stephen Rothwell
2024-02-26 0:03 Stephen Rothwell
2024-03-12 4:00 ` Stephen Rothwell
2024-02-07 22:59 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240913085945.40e7accf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=smfrench@gmail.com \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox