From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934757AbdACUhu (ORCPT ); Tue, 3 Jan 2017 15:37:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56992 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758242AbdACUhn (ORCPT ); Tue, 3 Jan 2017 15:37:43 -0500 Date: Tue, 3 Jan 2017 13:37:17 -0700 From: Alex Williamson To: Jani Nikula Cc: Zhenyu Wang , Stephen Rothwell , Daniel Vetter , Intel Graphics , linux-kernel@vger.kernel.org, DRI , linux-next@vger.kernel.org Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree Message-ID: <20170103133717.319f60aa@t450s.home> In-Reply-To: <8737h0i8cb.fsf@intel.com> References: <20170103104239.67dd95ba@canb.auug.org.au> <20170103025929.35gp5n27uc7iszra@zhen-hp.sh.intel.com> <20170102214857.6ad8f2eb@t450s.home> <20170103092317.slzmtrdzzrjzbypw@zhen-hp.sh.intel.com> <8737h0i8cb.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 03 Jan 2017 20:37:19 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 03 Jan 2017 15:25:24 +0200 Jani Nikula wrote: > On Tue, 03 Jan 2017, Zhenyu Wang wrote: > > On 2017.01.02 21:48:57 -0700, Alex Williamson wrote: > >> > Alex, I liked to have kvmgt related mdev interface change be merged through > >> > vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply > >> > below fix in your tree? I think in general for possible interface change in > >> > future we still need a pull request for i915 to resolve dependence earlier. > >> > >> Hi Zhenyu, > >> > >> Hopefully this abstraction will help to isolate vendor drivers from > >> mdev API changes in the future. I can certainly roll this patch into > >> the original to maintain bisectability. I want to get these changes in > >> for rc3, will a pull request for the i915 changes be sent this week? > > > > Send to Jani who is managing i915 fixes pull. > > Send what to me? I've pushed fixes to drm-intel-fixes today for testing, > and expect to send a pull request to Dave early Thursday. If there's a > conflict, it can usually be solved while merging, like Stephen has done. Unless there's some preference otherwise, I was only asking if the i915 changes were queued for rc3 such that I could trail behind them and fixup the mdev API change without relying on it getting caught in the merge. If we're happy to do it at merge time, I won't worry about it. Thanks, Alex