linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Keith Busch <kbusch@kernel.org>
To: Daniel Wagner <dwagner@suse.de>
Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
	Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
	Hannes Reinecke <hare@suse.de>
Subject: Re: [PATCH v4 1/4] nvme: move ns id info to struct nvme_ns_head
Date: Thu, 7 Dec 2023 09:31:16 -0700	[thread overview]
Message-ID: <ZXHzVN3jmIIsGyeq@kbusch-mbp> (raw)
In-Reply-To: <20231207123624.29959-2-dwagner@suse.de>

On Thu, Dec 07, 2023 at 01:36:21PM +0100, Daniel Wagner wrote:
> @@ -1906,7 +1908,8 @@ static void nvme_update_disk_info(struct gendisk *disk,
>  	 * or smaller than a sector size yet, so catch this early and don't
>  	 * allow block I/O.
>  	 */
> -	if (ns->lba_shift > PAGE_SHIFT || ns->lba_shift < SECTOR_SHIFT) {
> +	if (ns->head->lba_shift > PAGE_SHIFT ||
> +	    ns->head->lba_shift < SECTOR_SHIFT) {
>  		capacity = 0;
>  		bs = (1 << 9);
>  	}

A minor conflict here: this series would target nvme-6.8, but the block
tree we're based on doesn't have this code. I'll patch it up for the
current 6.8 tree and make a note of the conflict for the next merge
window.


  parent reply	other threads:[~2023-12-07 16:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-07 12:36 [PATCH v4 0/4] nvme: add csi, ms and nuse to sysfs Daniel Wagner
2023-12-07 12:36 ` [PATCH v4 1/4] nvme: move ns id info to struct nvme_ns_head Daniel Wagner
2023-12-07 15:31   ` [PATCH v4 0/4] nvme: add csi, ms and nuse to sysfs Christoph Hellwig
2023-12-08  9:10     ` Daniel Wagner
2023-12-07 16:31   ` Keith Busch [this message]
2023-12-08 13:04     ` [PATCH v4 1/4] nvme: move ns id info to struct nvme_ns_head Daniel Wagner
2023-12-07 12:36 ` [PATCH v4 2/4] nvme: rename ns attribute group Daniel Wagner
2023-12-07 15:32   ` Christoph Hellwig
2023-12-07 12:36 ` [PATCH v4 3/4] nvme: add csi, ms and nuse to sysfs Daniel Wagner
2023-12-07 12:42   ` Daniel Wagner
2023-12-07 15:33   ` Christoph Hellwig
2023-12-07 16:44   ` Keith Busch
2023-12-08  9:10     ` Daniel Wagner
2023-12-07 12:36 ` [PATCH v4 4/4] nvme: repack struct nvme_ns_head Daniel Wagner
2023-12-07 15:33   ` Christoph Hellwig

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=ZXHzVN3jmIIsGyeq@kbusch-mbp \
    --to=kbusch@kernel.org \
    --cc=dwagner@suse.de \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /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).