From: Jinpu Wang <jinpu.wang@ionos.com>
To: broonie@kernel.org
Cc: "Martin K . Petersen" <martin.petersen@oracle.com>,
Christoph Hellwig <hch@lst.de>, Gioh Kim <gi-oh.kim@ionos.com>,
Jens Axboe <axboe@kernel.dk>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Md Haris Iqbal <haris.iqbal@ionos.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block tree
Date: Tue, 22 Feb 2022 06:57:19 +0100 [thread overview]
Message-ID: <CAMGffEm_J9WcP2eoopwX8eEnRz9n4EycWxwgzP4c+NFr0eYXkw@mail.gmail.com> (raw)
In-Reply-To: <20220221215911.2948692-1-broonie@kernel.org>
On Mon, Feb 21, 2022 at 10:59 PM <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/block/rnbd/rnbd-clt.c
>
> between commit:
>
> 448025c103938 ("block/rnbd: client device does not care queue/rotational")
>
> from the block tree and commit:
>
> e8e9884730b36 ("scsi: rnbd: Remove 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.
Hi Broonie,
Thanks for fixing it up, it looks good. We will pay attention on this next time!
Regards!
Jinpu Wang
>
> diff --cc drivers/block/rnbd/rnbd-clt.c
> index 1f63f308eb394,dc192d2738854..0000000000000
> --- a/drivers/block/rnbd/rnbd-clt.c
> +++ b/drivers/block/rnbd/rnbd-clt.c
> @@@ -1606,13 -1607,13 +1603,13 @@@ struct rnbd_clt_dev *rnbd_clt_map_devic
> }
>
> rnbd_clt_info(dev,
> - "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_write_same_sectors: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, wc: %d, fua: %d)\n",
> - "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, rotational: %d, wc: %d, fua: %d)\n",
> ++ "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, wc: %d, fua: %d)\n",
> dev->gd->disk_name, dev->nsectors,
> dev->logical_block_size, dev->physical_block_size,
> - dev->max_write_same_sectors, dev->max_discard_sectors,
> + dev->max_discard_sectors,
> dev->discard_granularity, dev->discard_alignment,
> dev->secure_discard, dev->max_segments,
> - dev->max_hw_sectors, dev->rotational, dev->wc, dev->fua);
> + dev->max_hw_sectors, dev->wc, dev->fua);
>
> mutex_unlock(&dev->lock);
> rnbd_clt_put_sess(sess);
next prev parent reply other threads:[~2022-02-22 5:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 21:59 linux-next: manual merge of the scsi-mkp tree with the block tree broonie
2022-02-22 5:57 ` Jinpu Wang [this message]
2022-03-01 7:31 ` Stephen Rothwell
-- 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 22:06 broonie
2022-03-01 7:29 ` 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=CAMGffEm_J9WcP2eoopwX8eEnRz9n4EycWxwgzP4c+NFr0eYXkw@mail.gmail.com \
--to=jinpu.wang@ionos.com \
--cc=axboe@kernel.dk \
--cc=broonie@kernel.org \
--cc=gi-oh.kim@ionos.com \
--cc=haris.iqbal@ionos.com \
--cc=hch@lst.de \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).