Re: [PATCH 1/2] vfio/pci: remove vfio_pci_nvlink2

Michael Ellerman
2021-04-12T09:45:21Z

Alex Williamson <alex.williamson@redhat.com> writes:
> On Fri, 26 Mar 2021 07:13:10 +0100
> Christoph Hellwig <hch@lst.de> wrote:
>
>> This driver never had any open userspace (which for VFIO would include
>> VM kernel drivers) that use it, and thus should never have been added
>> by our normal userspace ABI rules.
>>
>> Signed-off-by: Christoph Hellwig <hch@lst.de>
>> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> ---
>> drivers/vfio/pci/Kconfig | 6 -
>> drivers/vfio/pci/Makefile | 1 -
>> drivers/vfio/pci/vfio_pci.c | 18 -
>> drivers/vfio/pci/vfio_pci_nvlink2.c | 490 ----------------------------
>> drivers/vfio/pci/vfio_pci_private.h | 14 -
>> include/uapi/linux/vfio.h | 38 +--
>> 6 files changed, 4 insertions(+), 563 deletions(-)
>> delete mode 100644 drivers/vfio/pci/vfio_pci_nvlink2.c
>
> Hearing no objections, applied to vfio next branch for v5.13. Thanks,

Looks like you only took patch 1?

I can't take patch 2 on its own, that would break the build.

Do you want to take both patches? There's currently no conflicts against
my tree. It's possible one could appear before the v5.13 merge window,
though it would probably just be something minor.

Or I could apply both patches to my tree, which means patch 1 would
appear as two commits in the git history, but that's not a big deal.

cheers