From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: Re: drm tip conflict in intel_workarounds.c
Date: Fri, 7 Dec 2018 08:49:45 +0000
Message-ID: <76c36718-0a6a-e3f7-8cdb-649d9c466312@linux.intel.com>
References: <CAPM=9ty-SwLrELOEt2eFeXqmvmZuMkPWxHXCU=kTPRwjfGNWZg@mail.gmail.com>
 <20181206193626.GA10646@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"; Format="flowed"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 83CF96E259
 for <intel-gfx@lists.freedesktop.org>; Fri,  7 Dec 2018 08:49:48 +0000 (UTC)
In-Reply-To: <20181206193626.GA10646@intel.com>
Content-Language: en-US
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: Rodrigo Vivi <rodrigo.vivi@intel.com>, Dave Airlie <airlied@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Ck9uIDA2LzEyLzIwMTggMTk6MzYsIFJvZHJpZ28gVml2aSB3cm90ZToKPiBPbiBUaHUsIERlYyAw
NiwgMjAxOCBhdCAxMjoyNTo0OFBNICsxMDAwLCBEYXZlIEFpcmxpZSB3cm90ZToKPj4gSSBtZXJn
ZWQgdGhlIGk5MTUgdHJlZSBpbnRvIGRybS1uZXh0IHRoaXMgbW9ybmluZywgYnV0IGdvdCBhIG1h
am9yCj4+IGNvbmZsaWN0IG9uIHRoZSBkcm0tdGlwIHJlYnVpbGQgaW4gaW50ZWxfd29ya2Fyb3Vu
ZHMuYy4KPj4KPj4gSSdtIG5vdCBzdXJlIGlmIEkgZGlkIHdyb25nIHRoaW5nLCBidXQgdGhlcmUg
d2VyZSBhIGNvdXBsZSBvZiBwbGFjZXMKPj4gd2hlcmUgdGhlIGNvZGUgc2VlbWVkIGluY29uc2lz
dGVudCBhbmQgSSBjb3VsZG4ndCB0cmFjayBkb3duIHdoYXQgd2FzCj4+IGFjdHVhbGx5IHdhbnRl
ZC4gSSdkIGFwcHJlY2lhdGUgc29tZW9uZSBjaGVja2luZyBteSB3b3JrIG9uIHdoYXQgaXMgaW4K
Pj4gY3VycmVudCBkcm0tdGlwLAo+IAo+IHdoYXQgaXMgY3VycmVudGx5IG9uIGRybS10aXAgbG9v
a3Mgc2FuZSB0byBtZS4KClllcyBJJ3ZlIGZpeGVkIGl0IHVwIHllc3RlcmRheSB3aXRoIERhbmll
bCdzIGhlbHAuCgpSZWdhcmRzLAoKVHZydGtvCgo+Pgo+PiAvKiBXYV8xNjA0MzAyNjk5OmljbCAq
Lwo+PiArICAgICAgICAgICAgICAgd2Ffd3JpdGVfb3Iod2FsLAo+PiArICAgICAgICAgICAgICAg
ICAgICAgICAgICAgR0VOMTBfTDNfQ0hJQ0tFTl9NT0RFX1JFR0lTVEVSLAo+PiArICAgICAgICAg
ICAgICAgICAgICAgICAgICAgR0VOMTFfSTJNX1dSSVRFX0RJU0FCTEUpOwo+Pgo+PiBhbmQKPj4K
Pj4gLQo+PiAtICAgICAgICAgICAgICAgLyogV2FfMTQwNjYwOTI1NTppY2wgKHByZS1wcm9kKSAq
Lwo+PiAtICAgICAgICAgICAgICAgaWYgKElTX0lDTF9SRVZJRChpOTE1LCBJQ0xfUkVWSURfQTAs
IElDTF9SRVZJRF9CMCkpCj4+IC0gICAgICAgICAgICAgICAgICAgICAgIHdhX3dyaXRlX29yKHdh
bCwKPj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0VON19TQVJDSEtNRCwK
Pj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0VON19ESVNBQkxFX0RFTUFO
RF9QUkVGRVRDSCB8Cj4+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdFTjdf
RElTQUJMRV9TQU1QTEVSX1BSRUZFVENIKTsKPj4KPj4gd2VyZSB0aGUgdHdvIHByb2JsZW1zIEkg
d2FzIHNlZWluZy4KPj4KPj4gRGF2ZS4KPj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KPj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+PiBJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz
LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp
c3RpbmZvL2ludGVsLWdmeAo=