From: Alex Williamson <alex.williamson@redhat.com>
To: Jason Gunthorpe <jgg@nvidia.com>, "Tian, Kevin" <kevin.tian@intel.com>
Cc: Cornelia Huck <cohuck@redhat.com>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>
Subject: Re: [PATCH v2 0/8] vfio: Split the container code into a clean layer and dedicated file
Date: Thu, 22 Sep 2022 11:09:30 -0600 [thread overview]
Message-ID: <20220922110930.0beadbc3.alex.williamson@redhat.com> (raw)
In-Reply-To: <Yyuzrqe8PocywMld@nvidia.com>
On Wed, 21 Sep 2022 22:00:30 -0300
Jason Gunthorpe <jgg@nvidia.com> wrote:
> On Wed, Sep 21, 2022 at 08:07:42AM +0000, Tian, Kevin wrote:
> > > From: Jason Gunthorpe <jgg@nvidia.com>
> > > Sent: Wednesday, September 21, 2022 8:42 AM
> > > drivers/vfio/Makefile | 1 +
> > > drivers/vfio/container.c | 680 +++++++++++++++++++++++++++++++++++++
> > > drivers/vfio/vfio.h | 56 ++++
> > > drivers/vfio/vfio_main.c | 708 ++-------------------------------------
> > > 4 files changed, 765 insertions(+), 680 deletions(-)
> > > create mode 100644 drivers/vfio/container.c
> > >
> > >
> > > base-commit: 245898eb9275ce31942cff95d0bdc7412ad3d589
> >
> > it's not the latest vfio/next:
>
> Ah, I did the rebase before I left for lpc..
>
> There is a minor merge conflict with the stuff from the last week:
>
> diff --cc drivers/vfio/Makefile
> index d67c604d0407ef,d5ae6921eb4ece..00000000000000
> --- a/drivers/vfio/Makefile
> +++ b/drivers/vfio/Makefile
> @@@ -1,11 -1,10 +1,12 @@@
> # SPDX-License-Identifier: GPL-2.0
> vfio_virqfd-y := virqfd.o
>
> -vfio-y += container.o
> -vfio-y += vfio_main.o
> -
> obj-$(CONFIG_VFIO) += vfio.o
> +
> +vfio-y += vfio_main.o \
> + iova_bitmap.o \
> ++ container.o
> +
> obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o
> obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o
> obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o
>
> Alex, let me know if you want me to respin it
That's trivial, but you also have conflicts with Kevin's 'Tidy up
vfio_device life cycle' series, which gets uglier than I'd like to
fixup on commit. Could one of you volunteer to rebase on the other?
Thanks,
Alex
next prev parent reply other threads:[~2022-09-22 17:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 0:42 [PATCH v2 0/8] vfio: Split the container code into a clean layer and dedicated file Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 1/8] vfio: Add header guards and includes to drivers/vfio/vfio.h Jason Gunthorpe
2022-09-21 8:00 ` Tian, Kevin
2022-09-21 0:42 ` [PATCH v2 2/8] vfio: Rename __vfio_group_unset_container() Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 3/8] vfio: Split the container logic into vfio_container_attach_group() Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 4/8] vfio: Remove #ifdefs around CONFIG_VFIO_NOIOMMU Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 5/8] vfio: Split out container code from the init/cleanup functions Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 6/8] vfio: Rename vfio_ioctl_check_extension() Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 7/8] vfio: Split the register_device ops call into functions Jason Gunthorpe
2022-09-21 0:42 ` [PATCH v2 8/8] vfio: Move container code into drivers/vfio/container.c Jason Gunthorpe
2022-09-21 8:06 ` Tian, Kevin
2022-09-21 8:07 ` [PATCH v2 0/8] vfio: Split the container code into a clean layer and dedicated file Tian, Kevin
2022-09-22 1:00 ` Jason Gunthorpe
2022-09-22 17:09 ` Alex Williamson [this message]
2022-09-22 17:22 ` Jason Gunthorpe
2022-09-22 17:58 ` Alex Williamson
2022-09-22 22:49 ` Tian, Kevin
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=20220922110930.0beadbc3.alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=jgg@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.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