From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: drm tip conflict in intel_workarounds.c
Date: Thu, 6 Dec 2018 11:36:26 -0800
Message-ID: <20181206193626.GA10646@intel.com>
References: <CAPM=9ty-SwLrELOEt2eFeXqmvmZuMkPWxHXCU=kTPRwjfGNWZg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga17.intel.com (mga17.intel.com [192.55.52.151])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 67A596E0BF
 for <intel-gfx@lists.freedesktop.org>; Thu,  6 Dec 2018 19:36:27 +0000 (UTC)
Content-Disposition: inline
In-Reply-To: <CAPM=9ty-SwLrELOEt2eFeXqmvmZuMkPWxHXCU=kTPRwjfGNWZg@mail.gmail.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Dave Airlie <airlied@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>, intel-gfx@lists.freedesktop.org, Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

T24gVGh1LCBEZWMgMDYsIDIwMTggYXQgMTI6MjU6NDhQTSArMTAwMCwgRGF2ZSBBaXJsaWUgd3Jv
dGU6Cj4gSSBtZXJnZWQgdGhlIGk5MTUgdHJlZSBpbnRvIGRybS1uZXh0IHRoaXMgbW9ybmluZywg
YnV0IGdvdCBhIG1ham9yCj4gY29uZmxpY3Qgb24gdGhlIGRybS10aXAgcmVidWlsZCBpbiBpbnRl
bF93b3JrYXJvdW5kcy5jLgo+IAo+IEknbSBub3Qgc3VyZSBpZiBJIGRpZCB3cm9uZyB0aGluZywg
YnV0IHRoZXJlIHdlcmUgYSBjb3VwbGUgb2YgcGxhY2VzCj4gd2hlcmUgdGhlIGNvZGUgc2VlbWVk
IGluY29uc2lzdGVudCBhbmQgSSBjb3VsZG4ndCB0cmFjayBkb3duIHdoYXQgd2FzCj4gYWN0dWFs
bHkgd2FudGVkLiBJJ2QgYXBwcmVjaWF0ZSBzb21lb25lIGNoZWNraW5nIG15IHdvcmsgb24gd2hh
dCBpcyBpbgo+IGN1cnJlbnQgZHJtLXRpcCwKCndoYXQgaXMgY3VycmVudGx5IG9uIGRybS10aXAg
bG9va3Mgc2FuZSB0byBtZS4KCj4gCj4gLyogV2FfMTYwNDMwMjY5OTppY2wgKi8KPiArICAgICAg
ICAgICAgICAgd2Ffd3JpdGVfb3Iod2FsLAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBH
RU4xMF9MM19DSElDS0VOX01PREVfUkVHSVNURVIsCj4gKyAgICAgICAgICAgICAgICAgICAgICAg
ICAgIEdFTjExX0kyTV9XUklURV9ESVNBQkxFKTsKPiAKPiBhbmQKPiAKPiAtCj4gLSAgICAgICAg
ICAgICAgIC8qIFdhXzE0MDY2MDkyNTU6aWNsIChwcmUtcHJvZCkgKi8KPiAtICAgICAgICAgICAg
ICAgaWYgKElTX0lDTF9SRVZJRChpOTE1LCBJQ0xfUkVWSURfQTAsIElDTF9SRVZJRF9CMCkpCj4g
LSAgICAgICAgICAgICAgICAgICAgICAgd2Ffd3JpdGVfb3Iod2FsLAo+IC0gICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIEdFTjdfU0FSQ0hLTUQsCj4gLSAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgR0VON19ESVNBQkxFX0RFTUFORF9QUkVGRVRDSCB8Cj4gLSAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0VON19ESVNBQkxFX1NBTVBMRVJfUFJFRkVU
Q0gpOwo+IAo+IHdlcmUgdGhlIHR3byBwcm9ibGVtcyBJIHdhcyBzZWVpbmcuCj4gCj4gRGF2ZS4K
PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVs
LWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0
cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h
aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==