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@xxxxxx>
OK, I'll ask Linus to merge this revert after my main PCI pull request
for v5.5-rc1.
