Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932229AbcKRQKD (ORCPT ); Fri, 18 Nov 2016 11:10:03 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:36687 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752558AbcKRQKA (ORCPT ); Fri, 18 Nov 2016 11:10:00 -0500 MIME-Version: 1.0 X-Originating-IP: [2a02:168:56b5:0:ac27:b86c:7764:9429] In-Reply-To: <20161118084020.0f212508@t450s.home> References: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com> <20161117142515.2d49a713@t450s.home> <20161117165145.3d7d2710@t450s.home> <20161118091632.n5bkzgqef7ghnvoh@zhen-hp.sh.intel.com> <20161118084020.0f212508@t450s.home> From: Daniel Vetter Date: Fri, 18 Nov 2016 17:09:59 +0100 X-Google-Sender-Auth: 1Qc1rnSoSlwksrLX4PfWdtBGCiA Message-ID: Subject: Re: [PATCH v14 00/22] Add Mediated device support To: Alex Williamson Cc: Zhenyu Wang , "Tian, Kevin" , Kirti Wankhede , "pbonzini@redhat.com" , "kraxel@redhat.com" , "cjia@nvidia.com" , "qemu-devel@nongnu.org" , "kvm@vger.kernel.org" , "Song, Jike" , "bjsdjshi@linux.vnet.ibm.com" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1919 Lines: 36 On Fri, Nov 18, 2016 at 4:40 PM, Alex Williamson wrote: >> 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, My understanding was that the mdev changes are needed to be able to apply the kvmgt stuff, and otherwise it won't build. For that I need a stable git tag&pull request (can be specific topic branch, which means subsystems can land in any order, or the full subsystem tree, which means depencies need to be tracked correctly). I am not going to resolve that in the merge window, since in drm we want everything lined up _before_ that opens (the feature cutoff is this w/e, but there's some wiggle room ofc). Sounds like there's just not enough time to line all the things up in time for 4.10, and the i915/kmvgt stuff needs to be postponed to 4.11. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch