From: Alex Williamson <alex.williamson@redhat.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Christoph Hellwig <hch@lst.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jason Gunthorpe <jgg@nvidia.com>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, linux-api@vger.kernel.org
Subject: Re: [PATCH 1/2] vfio/pci: remove vfio_pci_nvlink2
Date: Mon, 12 Apr 2021 08:23:04 -0600 [thread overview]
Message-ID: <20210412082304.5e7c0a80@omen> (raw)
In-Reply-To: <87y2dndelm.fsf@mpe.ellerman.id.au>
On Mon, 12 Apr 2021 19:41:41 +1000
Michael Ellerman <mpe@ellerman.id.au> wrote:
> 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.
I've already got a conflict in my next branch with patch 1, so it's
best to go through my tree. Seems like a shared branch would be
easiest to allow you to merge and manage potential conflicts against
patch 2, I've pushed a branch here:
https://github.com/awilliam/linux-vfio.git v5.13/vfio/nvlink
Thanks,
Alex
next prev parent reply other threads:[~2021-04-12 14:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 6:13 remove the nvlink2 pci_vfio subdriver v2 Christoph Hellwig
2021-03-26 6:13 ` [PATCH 1/2] vfio/pci: remove vfio_pci_nvlink2 Christoph Hellwig
2021-04-06 19:38 ` Alex Williamson
2021-04-12 9:41 ` Michael Ellerman
2021-04-12 14:23 ` Alex Williamson [this message]
2021-04-22 13:49 ` Michael Ellerman
2021-04-22 13:52 ` Jason Gunthorpe
2021-03-26 6:13 ` [PATCH 2/2] powerpc/powernv: remove the nvlink support Christoph Hellwig
2021-05-04 12:22 ` remove the nvlink2 pci_vfio subdriver v2 Greg Kurz
2021-05-04 12:59 ` Greg Kroah-Hartman
2021-05-04 13:00 ` Christoph Hellwig
2021-05-04 13:08 ` Cornelia Huck
2021-05-04 13:20 ` Greg Kurz
2021-05-04 13:30 ` Greg Kroah-Hartman
2021-05-04 14:11 ` Greg Kurz
2021-05-04 15:33 ` Alex Williamson
2021-05-04 14:23 ` Daniel Vetter
2021-05-04 15:53 ` Jason Gunthorpe
2021-05-04 16:30 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2021-03-22 15:01 remove the nvlink2 pci_vfio subdriver Christoph Hellwig
2021-03-22 15:01 ` [PATCH 1/2] vfio/pci: remove vfio_pci_nvlink2 Christoph Hellwig
2021-03-22 17:46 ` Alex Williamson
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=20210412082304.5e7c0a80@omen \
--to=alex.williamson@redhat.com \
--cc=airlied@linux.ie \
--cc=benh@kernel.crashing.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=jgg@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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).