On Wed, 21 Sep 2022 22:00:30 -0300 Jason Gunthorpe <jgg@xxxxxxxxxx> wrote: > On Wed, Sep 21, 2022 at 08:07:42AM +0000, Tian, Kevin wrote: > > > From: Jason Gunthorpe <jgg@xxxxxxxxxx> > > > 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
