Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 1 Nov 2019 17:44:16 -0500
From:   Bjorn Helgaas <helgaas@kernel.org>
To:     Christoph Hellwig <hch@lst.de>
Cc:     Jian-Hong Pan <jian-hong@endlessm.com>,
        Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
        Sagi Grimberg <sagi@grimberg.me>,
        linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux@endlessm.com,
        stable@vger.kernel.org
Subject: Re: [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running
 FW E8FK11.T"
Message-ID: <20191101224416.GA225762@google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20191031133028.GA4617@lst.de>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, Oct 31, 2019 at 02:30:28PM +0100, Christoph Hellwig wrote:
> On Thu, Oct 31, 2019 at 08:28:53AM -0500, Bjorn Helgaas wrote:
> > On Thu, Oct 31, 2019 at 05:34:09PM +0800, Jian-Hong Pan wrote:
> > > Since commit 253eaf4faaaa ("PCI/MSI: Fix incorrect MSI-X masking on
> > > resume") is merged, we can revert the previous quirk now.
> > 
> > 253eaf4faaaa is pending on my pci/msi branch, planned to be merged
> > during the v5.5 merge window.
> > 
> > This revert patch must not be merged before 253eaf4faaaa.  The easiest
> > way to do that would be for me to merge this one as well; otherwise
> > we have to try to make things happen in the right order during the
> > merge window.
> > 
> > If the NVMe folks ack this idea and the patch, I'd be happy to merge
> > it.
> 
> Fine with me.
> 
> Acked-by: Christoph Hellwig <hch@lst.de>

OK, I'll ask Linus to merge this revert after my main PCI pull request
for v5.5-rc1.