qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>,
	qemu-devel@nongnu.org, Maxim Levitsky <mlevitsk@redhat.com>,
	Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>,
	Javier Gonzalez <javier.gonz@samsung.com>,
	Max Reitz <mreitz@redhat.com>
Subject: Re: [PATCH 0/1] hw/block/nvme: fix assert on invalid irq vector
Date: Tue, 9 Jun 2020 17:32:43 +0200	[thread overview]
Message-ID: <20200609153243.GE11003@linux.fritz.box> (raw)
In-Reply-To: <48537ee1-ed77-ffe6-66ba-d61838083069@redhat.com>

Am 09.06.2020 um 16:18 hat Philippe Mathieu-Daudé geschrieben:
> On 6/9/20 4:14 PM, Kevin Wolf wrote:
> > Am 09.06.2020 um 13:46 hat Klaus Jensen geschrieben:
> >> On Jun  9 13:17, Philippe Mathieu-Daudé wrote:
> >>> On 6/9/20 11:45 AM, Klaus Jensen wrote:
> >>>> From: Klaus Jensen <k.jensen@samsung.com>
> >>>>
> >>>> I goofed up with commit c09794fe40e3 ("hw/block/nvme: allow use of any
> >>>> valid msix vector").
> >>>
> >>> Kevin, since your queue isn't merged, can you directly squash the fix?
> >>
> >> The commit (c09794fe40e3) can just be dropped without conflicts, but it
> >> leaves a use of n->params.num_queues in nvme_create_cq() which commit
> >> cde74bfd4b87 ("hw/block/nvme: add max_ioqpairs device parameter") must
> >> fix.
> > 
> > Hm, so it seems this isn't easy to squash in without conflicts (and I
> > would have to rewrite the whole commit message), so I think it's better
> > to just apply the series on top.
> > 
> > One problem with the commit message is that it references commit IDs
> > which aren't stable yet. Maybe it's best if I apply these patches,
> > manually fix up the commit ID references and then immediately do a pull
> > request so that they become stable.
> 
> This is the friendlier way.
> 
> Less friendly way is to drop Klaus's patches and ask him to respin.
> While this is a valid outcome, if we can avoid it it will save all of us
> review time.

If Klaus wants to do that, fine with me. I'm just trying to find the
easiest solution for all of us.

> > It would be good to have at least one review, though.
> 
> Maxim catched this issue, I'd feel safer if he acks your pre-merge queue.

Ok. Maxim, can you please review this series then?

Kevin



  reply	other threads:[~2020-06-09 15:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-09  9:45 [PATCH 0/1] hw/block/nvme: fix assert on invalid irq vector Klaus Jensen
2020-06-09  9:45 ` [PATCH 1/2] hw/block/nvme: add msix_qsize parameter Klaus Jensen
2020-06-09  9:45 ` [PATCH 2/2] hw/block/nvme: verify msix_init_exclusive_bar() return value Klaus Jensen
2020-06-09 11:17 ` [PATCH 0/1] hw/block/nvme: fix assert on invalid irq vector Philippe Mathieu-Daudé
2020-06-09 11:46   ` Klaus Jensen
2020-06-09 14:14     ` Kevin Wolf
2020-06-09 14:18       ` Philippe Mathieu-Daudé
2020-06-09 15:32         ` Kevin Wolf [this message]
2020-06-09 18:38           ` Klaus Jensen
2020-07-07  9:10           ` Maxim Levitsky
2020-07-07  9:29             ` Klaus Jensen

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=20200609153243.GE11003@linux.fritz.box \
    --to=kwolf@redhat.com \
    --cc=its@irrelevant.dk \
    --cc=javier.gonz@samsung.com \
    --cc=k.jensen@samsung.com \
    --cc=kbusch@kernel.org \
    --cc=mlevitsk@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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).