From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: Re: [PATCH] drm/i915: Fix silent conflict from
	backmerge of drm-next into dinf
Date: Mon, 10 Oct 2016 16:11:06 +0300
Message-ID: <87mvics61h.fsf@intel.com>
References: <20161010125017.23911-1-chris@chris-wilson.co.uk>
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 mga07.intel.com (mga07.intel.com [134.134.136.100])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 5EA5D6E036
 for <intel-gfx@lists.freedesktop.org>; Mon, 10 Oct 2016 13:11:09 +0000 (UTC)
In-Reply-To: <20161010125017.23911-1-chris@chris-wilson.co.uk>
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: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

T24gTW9uLCAxMCBPY3QgMjAxNiwgQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u
dWs+IHdyb3RlOgo+IE1lcmdpbmcgZnJvbSBkcm0tbmV4dCBwdWxsZWQgYmFjayBpbiBhIGZldyBs
aW5lcyBvZiBkZWFkIGNvZGUgZHVlIHRvIHRoZQo+IGNvZGUgbW92ZW1lbnQgYXJvdW5kIGk5MTVf
Z2VtX3Jlc2V0KCksIGZpeCB0aGF0IHVwLgoKQWN0dWFsbHkgdGhlIHByb2JsZW0gd2FzIGludHJv
ZHVjZWQgaW4KCmNvbW1pdCBjYTA5ZmI5ZjYwYjVmM2FiMmQ1N2U3NjFhYWVlYTg5YTUxNDdkNzg0
Ck1lcmdlOiA5ZjRlZjA1YmNkY2YgMDg4OTVhOGI2YjA2CkF1dGhvcjogRGF2ZSBBaXJsaWUgPGFp
cmxpZWRAcmVkaGF0LmNvbT4KRGF0ZTogICBXZWQgU2VwIDI4IDEyOjA4OjQ5IDIwMTYgKzEwMDAK
CiAgICBNZXJnZSB0YWcgJ3Y0LjgtcmM4JyBpbnRvIGRybS1uZXh0CgphbmQgaXQncyBwcmVzZW50
IGluIGRybS1uZXh0LCBhbmQgdGhlIGNvbmZsaWN0IHdhc24ndCBzaWxlbnQuCgpJZiB0aGlzIGlz
IHRoZSByaWdodCBmaXggKERhbmllbCBhY2s/KSBJJ2xsIHF1ZXVlIGl0IHdpdGggb3RoZXIgZHJt
LW5leHQKZml4ZXMgdGhhdCBJIGhhdmUuCgoKQlIsCkphbmkuCgoKPgo+IFNpZ25lZC1vZmYtYnk6
IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBKYW5pIE5pa3Vs
YSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgo+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0
dGVyQGZmd2xsLmNoPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwg
MyAtLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDMgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtLmMKPiBpbmRleCA5ODFhMTA2OTAxYWUuLjE0MThjMWM1MjJjYiAxMDA2NDQKPiAtLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW0uYwo+IEBAIC0yNjE2LDggKzI2MTYsNiBAQCBzdGF0aWMgdm9pZCBpOTE1
X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+ICAJbGlz
dF9mb3JfZWFjaF9lbnRyeV9jb250aW51ZShyZXF1ZXN0LCAmZW5naW5lLT5yZXF1ZXN0X2xpc3Qs
IGxpbmspCj4gIAkJaWYgKHJlcXVlc3QtPmN0eCA9PSBpbmNvbXBsZXRlX2N0eCkKPiAgCQkJcmVz
ZXRfcmVxdWVzdChyZXF1ZXN0KTsKPiAtCj4gLQllbmdpbmUtPmk5MTUtPmd0LmFjdGl2ZV9lbmdp
bmVzICY9IH5pbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpOwo+ICB9Cj4gIAo+ICB2b2lkIGk5MTVf
Z2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiBAQCAtMjYyOCw3
ICsyNjI2LDYgQEAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYpCj4gIAo+ICAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYpCj4gIAkJ
aTkxNV9nZW1fcmVzZXRfZW5naW5lKGVuZ2luZSk7Cj4gLQltb2RfZGVsYXllZF93b3JrKGRldl9w
cml2LT53cSwgJmRldl9wcml2LT5ndC5pZGxlX3dvcmssIDApOwo+ICAKPiAgCWk5MTVfZ2VtX3Jl
c3RvcmVfZmVuY2VzKCZkZXZfcHJpdi0+ZHJtKTsKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3Bl
biBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz
dGluZm8vaW50ZWwtZ2Z4Cg==