From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Chuck Lever <chuck.lever@oracle.com>
Cc: Chengming Zhou <zhouchengming@bytedance.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the block tree with the nfsd tree
Date: Wed, 9 Aug 2023 11:03:34 +1000 [thread overview]
Message-ID: <20230809110334.63b7c566@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
block/blk-flush.c
between commit:
bed5a600c6b0 ("block: Revert 615939a2ae73")
from the nfsd tree and commits:
28b241237470 ("blk-flush: fix rq->flush.seq for post-flush requests")
b175c86739d3 ("blk-flush: count inflight flush_data requests")
from the block tree.
I fixed it up (I used the former, though I wonder if 28b241237470 fixes
what the revert is trying to work around) 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-08-09 1:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 1:03 Stephen Rothwell [this message]
2023-08-09 1:08 ` linux-next: manual merge of the block tree with the nfsd tree Chuck Lever
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=20230809110334.63b7c566@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=chuck.lever@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=zhouchengming@bytedance.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;
as well as URLs for NNTP newsgroup(s).