From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>,
James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: broonie@kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Chaitanya Kulkarni <kch@nvidia.com>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block tree
Date: Tue, 1 Mar 2022 18:29:58 +1100 [thread overview]
Message-ID: <20220301182958.7897ce30@canb.auug.org.au> (raw)
In-Reply-To: <20220221220622.3000432-1-broonie@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]
Hi all,
On Mon, 21 Feb 2022 22:06:22 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> block/blk-lib.c
>
> between commit:
>
> 0a3140ea0fae3 ("block: pass a block_device and opf to blk_next_bio")
>
> from the block tree and commit:
>
> 2988062985d59 ("scsi: block: Remove REQ_OP_WRITE_SAME support")
>
> from the scsi-mkp tree.
>
> I fixed it up (see below) 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.
>
> diff --cc block/blk-lib.c
> index fc6ea52e74824,bf5254ccdb5f8..0000000000000
> --- a/block/blk-lib.c
> +++ b/block/blk-lib.c
>
> (took the deletion of _WRITE_SAME from scsi-mkp)
This is now a conflict between the scsi tree and the block tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-03-01 7:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 22:06 linux-next: manual merge of the scsi-mkp tree with the block tree broonie
2022-03-01 7:29 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-18 4:55 Stephen Rothwell
2024-04-18 5:57 ` Christoph Hellwig
2024-04-26 6:01 ` Stephen Rothwell
2022-02-21 21:59 broonie
2022-02-22 5:57 ` Jinpu Wang
2022-03-01 7:31 ` Stephen Rothwell
2021-01-27 6:58 Stephen Rothwell
2019-02-11 4:23 Stephen Rothwell
2017-04-26 5:47 Stephen Rothwell
2016-11-09 2:54 Stephen Rothwell
2016-11-11 19:55 ` Martin K. Petersen
2016-11-17 2:44 ` 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=20220301182958.7897ce30@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=axboe@kernel.dk \
--cc=broonie@kernel.org \
--cc=hch@lst.de \
--cc=kch@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.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).