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 17:36:16 +0300
Message-ID: <8760p0s23j.fsf@intel.com>
References: <20161010125017.23911-1-chris@chris-wilson.co.uk>
 <87mvics61h.fsf@intel.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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTPS id DE7B76E543
 for <intel-gfx@lists.freedesktop.org>; Mon, 10 Oct 2016 14:36:20 +0000 (UTC)
In-Reply-To: <87mvics61h.fsf@intel.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: 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

T24gTW9uLCAxMCBPY3QgMjAxNiwgSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4g
d3JvdGU6Cj4gT24gTW9uLCAxMCBPY3QgMjAxNiwgQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13
aWxzb24uY28udWs+IHdyb3RlOgo+PiBNZXJnaW5nIGZyb20gZHJtLW5leHQgcHVsbGVkIGJhY2sg
aW4gYSBmZXcgbGluZXMgb2YgZGVhZCBjb2RlIGR1ZSB0byB0aGUKPj4gY29kZSBtb3ZlbWVudCBh
cm91bmQgaTkxNV9nZW1fcmVzZXQoKSwgZml4IHRoYXQgdXAuCj4KPiBBY3R1YWxseSB0aGUgcHJv
YmxlbSB3YXMgaW50cm9kdWNlZCBpbgo+Cj4gY29tbWl0IGNhMDlmYjlmNjBiNWYzYWIyZDU3ZTc2
MWFhZWVhODlhNTE0N2Q3ODQKPiBNZXJnZTogOWY0ZWYwNWJjZGNmIDA4ODk1YThiNmIwNgo+IEF1
dGhvcjogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KPiBEYXRlOiAgIFdlZCBTZXAg
MjggMTI6MDg6NDkgMjAxNiArMTAwMAo+Cj4gICAgIE1lcmdlIHRhZyAndjQuOC1yYzgnIGludG8g
ZHJtLW5leHQKPgo+IGFuZCBpdCdzIHByZXNlbnQgaW4gZHJtLW5leHQsIGFuZCB0aGUgY29uZmxp
Y3Qgd2Fzbid0IHNpbGVudC4KPgo+IElmIHRoaXMgaXMgdGhlIHJpZ2h0IGZpeCAoRGFuaWVsIGFj
az8pIEknbGwgcXVldWUgaXQgd2l0aCBvdGhlciBkcm0tbmV4dAo+IGZpeGVzIHRoYXQgSSBoYXZl
LgoKQW5kIHB1c2hlZCB0byBkcm0taW50ZWwtbmV4dC1maXhlcyAqb25seSosIHdpdGggYW4gdXBk
YXRlZCBjb21taXQKbWVzc2FnZS4KCkJSLApKYW5pLgoKPgo+Cj4gQlIsCj4gSmFuaS4KPgo+Cj4+
Cj4+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr
Pgo+PiBDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KPj4gQ2M6IERhbmll
bCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4+IC0tLQo+PiAgZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDMgLS0tCj4+ICAxIGZpbGUgY2hhbmdlZCwgMyBkZWxldGlv
bnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4+IGluZGV4IDk4MWExMDY5MDFhZS4u
MTQxOGMxYzUyMmNiIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bS5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPj4gQEAgLTI2MTYs
OCArMjYxNiw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICplbmdpbmUpCj4+ICAJbGlzdF9mb3JfZWFjaF9lbnRyeV9jb250aW51ZShy
ZXF1ZXN0LCAmZW5naW5lLT5yZXF1ZXN0X2xpc3QsIGxpbmspCj4+ICAJCWlmIChyZXF1ZXN0LT5j
dHggPT0gaW5jb21wbGV0ZV9jdHgpCj4+ICAJCQlyZXNldF9yZXF1ZXN0KHJlcXVlc3QpOwo+PiAt
Cj4+IC0JZW5naW5lLT5pOTE1LT5ndC5hY3RpdmVfZW5naW5lcyAmPSB+aW50ZWxfZW5naW5lX2Zs
YWcoZW5naW5lKTsKPj4gIH0KPj4gIAo+PiAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4+IEBAIC0yNjI4LDcgKzI2MjYsNiBAQCB2b2lkIGk5
MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPj4gIAo+PiAg
CWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KQo+PiAgCQlpOTE1X2dlbV9yZXNldF9l
bmdpbmUoZW5naW5lKTsKPj4gLQltb2RfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9w
cml2LT5ndC5pZGxlX3dvcmssIDApOwo+PiAgCj4+ICAJaTkxNV9nZW1fcmVzdG9yZV9mZW5jZXMo
JmRldl9wcml2LT5kcm0pOwoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNo
bm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v
cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK