On Wed, Aug 14, 2019 at 11:14:09AM +0100, Lorenzo Pieralisi wrote:
> On Tue, Jul 23, 2019 at 04:21:07PM -0500, Bjorn Helgaas wrote:
> > On Sat, Jul 13, 2019 at 11:03:53AM -0400, Sasha Levin wrote:
> 
> [...]
> 
> > > > > v3: corrected Fixes: tag [Dexuan Cui <de...@microsoft.com>]
> > > > >     This is the Microsoft-preferred version of the patch.
> > > > > 
> > > > >  drivers/pci/Kconfig |    2 +-
> > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > 
> > > > > --- lnx-52.orig/drivers/pci/Kconfig
> > > > > +++ lnx-52/drivers/pci/Kconfig
> > > > > @@ -181,7 +181,7 @@ config PCI_LABEL
> > > > > 
> > > > >  config PCI_HYPERV
> > > > >          tristate "Hyper-V PCI Frontend"
> > > > > -        depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN
> > > > > && X86_64
> > > > > +        depends on X86_64 && HYPERV && PCI_MSI &&
> > > > > PCI_MSI_IRQ_DOMAIN && SYSFS
> > > > >          help
> > > > >            The PCI device frontend driver allows the kernel to import 
> > > > > arbitrary
> > > > >            PCI devices from a PCI backend to support PCI driver 
> > > > > domains.
> > > > > 
> > > > 
> > > > Reviewed-by: Haiyang Zhang <haiya...@microsoft.com>
> > > 
> > > Queued up for hyperv-fixes, thank you!
> > 
> > What merge strategy do you envision for this?  Previous
> > drivers/pci/controller/pci-hyperv.c changes have generally been merged
> > by Lorenzo and incorporated into my PCI tree.
> > 
> > This particular patch doesn't actually touch pci-hyperv.c; it touches
> > drivers/pci/Kconfig, so should somehow be coordinated with me.
> 
> Bjorn please let me know if you can pick this up or I should, thanks.

Would you mind picking it up?  Then we can sort of keep all the
Hyper-V-related changes together.

Reply via email to