From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Steve French <smfrench@gmail.com>
Cc: CIFS <linux-cifs@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
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 block tree with the cifs tree
Date: Mon, 20 Feb 2023 11:33:33 +1100 [thread overview]
Message-ID: <20230220113333.16a38bbd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 780 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/cifs/file.c
between commit:
8378eea2e41f ("cifs: Change the I/O paths to use an iterator rather than a page list")
from the cifs tree and commit:
45b94876f54e ("iov_iter: Kill ITER_PIPE")
from the block tree.
I fixed it up (the former removed the function updated by the latter,
so I did that) 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:[~2023-02-20 0:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 0:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-20 0:50 linux-next: manual merge of the block tree with the cifs tree Stephen Rothwell
2023-02-21 0:39 ` Stephen Rothwell
2023-02-21 0:47 ` Steve French
2023-02-20 0:46 Stephen Rothwell
2023-02-21 0:38 ` Stephen Rothwell
2023-02-20 0:42 Stephen Rothwell
2023-02-21 0:37 ` Stephen Rothwell
2023-02-20 0:21 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=20230220113333.16a38bbd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--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