From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: linux-next: manual merge of the tip tree with the drm-intel tree Date: Tue, 8 Nov 2016 18:02:00 +0100 Message-ID: <20161108170200.GL3117@twins.programming.kicks-ass.net> References: <20161108152541.096711bb@canb.auug.org.au> <20161108104403.mi3onjfn65etrrtu@phenom.ffwll.local> <20161108132448.GG3117@twins.programming.kicks-ass.net> <20161108160916.56nxpkiupw3u7rgy@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20161108160916.56nxpkiupw3u7rgy@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson , Joonas Lahtinen , Rob Clark List-Id: linux-next.vger.kernel.org T24gVHVlLCBOb3YgMDgsIDIwMTYgYXQgMDU6MDk6MTZQTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiA+IFlvdSdyZSB0YWxraW5nIGFib3V0Ogo+ID4gCj4gPiAgIGxrbWwua2VybmVsLm9y Zy9yLzIwMTYxMDA3MTU0MzUxLkdMMzExN0B0d2lucy5wcm9ncmFtbWluZy5raWNrcy1hc3MubmV0 Cj4gPiAKPiA+ID8gSSBnb3Qgbm8gZmVlZGJhY2sgZnJvbSB5b3UgRFJNIGd1eXMgb24gdGhhdCBz byBJIGtpbmRhIGZvcmdvdCBhYm91dAo+ID4gdGhhdCBpbiB0aGUgaG9wZSB3ZSdkIG5vdCBoYXZl IHRvIGRvIHRoaXMgYXQgYWxsLgo+IAo+IFllcy4gQ2hyaXMvSm9vbmFzLCBwbHMgZ2l2ZSB0aGlz IGlzIGEgc3BpbiBhbmQgcmV2aWV3LgoKT0ssIEknbGwgcmVzcGluIHRoYXQgdGhpbmcgd2l0aCBM aW51cycgZmVlZGJhY2sgZXRjLiBNaWdodCBub3QgYmUgdW50aWwKdG9tb3Jyb3cgdGhvdWdoLCBz byBhbnkgYWRkaXRpb25hbCBmZWVkYmFjayB3b3VsZCBiZSBnb29kLgoKVGhhbmtzIQpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753955AbcKHRCY (ORCPT ); Tue, 8 Nov 2016 12:02:24 -0500 Received: from merlin.infradead.org ([205.233.59.134]:45922 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752028AbcKHRCW (ORCPT ); Tue, 8 Nov 2016 12:02:22 -0500 Date: Tue, 8 Nov 2016 18:02:00 +0100 From: Peter Zijlstra To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson , Joonas Lahtinen , Rob Clark Subject: Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree Message-ID: <20161108170200.GL3117@twins.programming.kicks-ass.net> References: <20161108152541.096711bb@canb.auug.org.au> <20161108104403.mi3onjfn65etrrtu@phenom.ffwll.local> <20161108132448.GG3117@twins.programming.kicks-ass.net> <20161108160916.56nxpkiupw3u7rgy@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161108160916.56nxpkiupw3u7rgy@phenom.ffwll.local> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 08, 2016 at 05:09:16PM +0100, Daniel Vetter wrote: > > You're talking about: > > > > lkml.kernel.org/r/20161007154351.GL3117@twins.programming.kicks-ass.net > > > > ? I got no feedback from you DRM guys on that so I kinda forgot about > > that in the hope we'd not have to do this at all. > > Yes. Chris/Joonas, pls give this is a spin and review. OK, I'll respin that thing with Linus' feedback etc. Might not be until tomorrow though, so any additional feedback would be good. Thanks!