On Fri, 18 Nov 2016 17:16:32 +0800
Zhenyu Wang <zhen...@linux.intel.com> wrote:

> On 2016.11.17 16:51:45 -0700, Alex Williamson wrote:
> > On Thu, 17 Nov 2016 23:29:38 +0000
> > "Tian, Kevin" <kevin.t...@intel.com> wrote:
> >   
> > > > From: Alex Williamson [mailto:alex.william...@redhat.com]
> > > > Sent: Friday, November 18, 2016 5:25 AM
> > > > 
> > > > On Thu, 17 Nov 2016 02:16:12 +0530
> > > > Kirti Wankhede <kwankh...@nvidia.com> wrote:    
> > > > >
> > > > >  Documentation/ABI/testing/sysfs-bus-vfio-mdev |  111 ++
> > > > >  Documentation/vfio-mediated-device.txt        |  399 +++++++
> > > > >  MAINTAINERS                                   |    9 +
> > > > >  drivers/vfio/Kconfig                          |    1 +
> > > > >  drivers/vfio/Makefile                         |    1 +
> > > > >  drivers/vfio/mdev/Kconfig                     |   17 +
> > > > >  drivers/vfio/mdev/Makefile                    |    5 +
> > > > >  drivers/vfio/mdev/mdev_core.c                 |  385 +++++++
> > > > >  drivers/vfio/mdev/mdev_driver.c               |  119 ++
> > > > >  drivers/vfio/mdev/mdev_private.h              |   41 +
> > > > >  drivers/vfio/mdev/mdev_sysfs.c                |  286 +++++
> > > > >  drivers/vfio/mdev/vfio_mdev.c                 |  180 +++
> > > > >  drivers/vfio/pci/vfio_pci.c                   |   83 +-
> > > > >  drivers/vfio/platform/vfio_platform_common.c  |   31 +-
> > > > >  drivers/vfio/vfio.c                           |  340 +++++-
> > > > >  drivers/vfio/vfio_iommu_type1.c               |  872 +++++++++++---
> > > > >  include/linux/mdev.h                          |  177 +++
> > > > >  include/linux/vfio.h                          |   32 +-
> > > > >  include/uapi/linux/vfio.h                     |   10 +
> > > > >  samples/vfio-mdev/Makefile                    |   13 +
> > > > >  samples/vfio-mdev/mtty.c                      | 1503    
> > > > +++++++++++++++++++++++++    
> > > > >  21 files changed, 4358 insertions(+), 257 deletions(-)
> > > > >  create mode 100644 Documentation/ABI/testing/sysfs-bus-vfio-mdev
> > > > >  create mode 100644 Documentation/vfio-mediated-device.txt
> > > > >  create mode 100644 drivers/vfio/mdev/Kconfig
> > > > >  create mode 100644 drivers/vfio/mdev/Makefile
> > > > >  create mode 100644 drivers/vfio/mdev/mdev_core.c
> > > > >  create mode 100644 drivers/vfio/mdev/mdev_driver.c
> > > > >  create mode 100644 drivers/vfio/mdev/mdev_private.h
> > > > >  create mode 100644 drivers/vfio/mdev/mdev_sysfs.c
> > > > >  create mode 100644 drivers/vfio/mdev/vfio_mdev.c
> > > > >  create mode 100644 include/linux/mdev.h
> > > > >  create mode 100644 samples/vfio-mdev/Makefile
> > > > >  create mode 100644 samples/vfio-mdev/mtty.c    
> > > > 
> > > > As discussed, I dropped patch 12, updated the documentation, and added
> > > > 'retries' initialization.  This is now applied to my next branch for
> > > > v4.10.  Thanks to the reviewers and Kirti and Neo for your hard work!
> > > > Thanks,
> > > >     
> > > 
> > > That's a great news! Alex, do you have an idea when this series may
> > > hit linux-next? :-)  
> > 
> > Whenever there's a new build, hopefully within the next 24hrs, but I
> > don't really know the schedule.  Thanks,
> >   
> 
> Alex, could you do a pull request of mdev for Daniel's drm-intel tree?
> We need to send KVMGT mdev support pull base on that.

No, this is not how I intend or prefer to merge this.  This is a large
change for vfio and it is not exclusive to KVMGT.  We have linux-next
to facilitate handling dependencies between subsystems during
development and a two week merge window to allow managing how these
changes enter the mainline tree.  If I were to have this pulled into
drm-intel it ties my hands as to how I can manage changes within my
functional area.  I want these two weeks of linux-next exposure for
vetting the changes and resolving any remaining issues.  I'm not going
to compromise my ability to react to such issues.  linux-next inclusion
should be sufficient for you to coordinate through the drm tree, though
Daniel will need to be made aware of the dependency.  I will however
plan to send my pull request to Linus early in the merge window to
accommodate dependent changes also being included for v4.10. Hope
you understand, thanks,

Alex

Reply via email to