From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: linux-next: build failure after merge of the drm-intel-fixes tree Date: Tue, 03 Jan 2017 15:25:24 +0200 Message-ID: <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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170103092317.slzmtrdzzrjzbypw@zhen-hp.sh.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Zhenyu Wang , Alex Williamson Cc: Stephen Rothwell , Daniel Vetter , Intel Graphics , linux-kernel@vger.kernel.org, DRI , linux-next@vger.kernel.org List-Id: linux-next.vger.kernel.org T24gVHVlLCAwMyBKYW4gMjAxNywgWmhlbnl1IFdhbmcgPHpoZW55dXdAbGludXguaW50ZWwuY29t PiB3cm90ZToKPiBPbiAyMDE3LjAxLjAyIDIxOjQ4OjU3IC0wNzAwLCBBbGV4IFdpbGxpYW1zb24g d3JvdGU6Cj4+ID4gQWxleCwgSSBsaWtlZCB0byBoYXZlIGt2bWd0IHJlbGF0ZWQgbWRldiBpbnRl cmZhY2UgY2hhbmdlIGJlIG1lcmdlZCB0aHJvdWdoCj4+ID4gdmZpbyB0cmVlLCBidXQgd2Fzbid0 IGF3YXJlZCBvbmUgb2YgSmlrZSdzIGZpeCBoYWQgY29uZmxpY3QuIENvdWxkIHlvdSBhcHBseQo+ PiA+IGJlbG93IGZpeCBpbiB5b3VyIHRyZWU/IEkgdGhpbmsgaW4gZ2VuZXJhbCBmb3IgcG9zc2li bGUgaW50ZXJmYWNlIGNoYW5nZSBpbgo+PiA+IGZ1dHVyZSB3ZSBzdGlsbCBuZWVkIGEgcHVsbCBy ZXF1ZXN0IGZvciBpOTE1IHRvIHJlc29sdmUgZGVwZW5kZW5jZSBlYXJsaWVyLgo+PiAKPj4gSGkg Wmhlbnl1LAo+PiAKPj4gSG9wZWZ1bGx5IHRoaXMgYWJzdHJhY3Rpb24gd2lsbCBoZWxwIHRvIGlz b2xhdGUgdmVuZG9yIGRyaXZlcnMgZnJvbQo+PiBtZGV2IEFQSSBjaGFuZ2VzIGluIHRoZSBmdXR1 cmUuICBJIGNhbiBjZXJ0YWlubHkgcm9sbCB0aGlzIHBhdGNoIGludG8KPj4gdGhlIG9yaWdpbmFs IHRvIG1haW50YWluIGJpc2VjdGFiaWxpdHkuICBJIHdhbnQgdG8gZ2V0IHRoZXNlIGNoYW5nZXMg aW4KPj4gZm9yIHJjMywgd2lsbCBhIHB1bGwgcmVxdWVzdCBmb3IgdGhlIGk5MTUgY2hhbmdlcyBi ZSBzZW50IHRoaXMgd2Vlaz8KPgo+IFNlbmQgdG8gSmFuaSB3aG8gaXMgbWFuYWdpbmcgaTkxNSBm aXhlcyBwdWxsLgoKU2VuZCB3aGF0IHRvIG1lPyBJJ3ZlIHB1c2hlZCBmaXhlcyB0byBkcm0taW50 ZWwtZml4ZXMgdG9kYXkgZm9yIHRlc3RpbmcsCmFuZCBleHBlY3QgdG8gc2VuZCBhIHB1bGwgcmVx dWVzdCB0byBEYXZlIGVhcmx5IFRodXJzZGF5LiBJZiB0aGVyZSdzIGEKY29uZmxpY3QsIGl0IGNh biB1c3VhbGx5IGJlIHNvbHZlZCB3aGlsZSBtZXJnaW5nLCBsaWtlIFN0ZXBoZW4gaGFzIGRvbmUu CgpCUiwKSmFuaS4KCgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xv Z3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757757AbdACN0V (ORCPT ); Tue, 3 Jan 2017 08:26:21 -0500 Received: from mga05.intel.com ([192.55.52.43]:42564 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756987AbdACNZ2 (ORCPT ); Tue, 3 Jan 2017 08:25:28 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,451,1477983600"; d="scan'208";a="804621508" From: Jani Nikula To: Zhenyu Wang , Alex Williamson Cc: 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 In-Reply-To: <20170103092317.slzmtrdzzrjzbypw@zhen-hp.sh.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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> Date: Tue, 03 Jan 2017 15:25:24 +0200 Message-ID: <8737h0i8cb.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center