From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: linux-next: manual merge of the drm-intel tree with the
 drm-intel-fixes tree
Date: Tue, 14 Jul 2015 09:34:36 +0200
Message-ID: <20150714073436.GA3736@phenom.ffwll.local>
References: <20150714121112.29dc5e75@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Content-Disposition: inline
In-Reply-To: <20150714121112.29dc5e75@canb.auug.org.au>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org
List-Id: linux-next.vger.kernel.org

T24gVHVlLCBKdWwgMTQsIDIwMTUgYXQgMTI6MTE6MTJQTSArMTAwMCwgU3RlcGhlbiBSb3Rod2Vs
bCB3cm90ZToKPiBIaSBhbGwsCj4gCj4gVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBk
cm0taW50ZWwgdHJlZSBnb3QgYSBjb25mbGljdCBpbjoKPiAKPiAgIGRyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYwo+IAo+IGJldHdlZW4gY29tbWl0Ogo+IAo+ICAgOGFhMzA1M2Jm
NzMxICgiZHJtL2k5MTU6IGZpeCBvb3BzIGluIHByaW1hcnlfY2hlY2tfcGxhbmUiKQo+IAo+IGZy
b20gdGhlIGRybS1pbnRlbC1maXhlcyB0cmVlIGFuZCBjb21taXQ6Cj4gCj4gICBkYTIwZWFiZDJj
NjkgKCJkcm0vaTkxNTogU3BsaXQgcGxhbmUgdXBkYXRlcyBvZiBjcnRjLT5hdG9taWMgaW50byBh
IGhlbHBlciwgdjIuIikKPiAKPiBmcm9tIHRoZSBkcm0taW50ZWwgdHJlZS4KPiAKPiBJIGZpeGVk
IGl0IHVwIChidXQgaXQgcHJvYmFibHkgbmVlZHMgbW9yZSAtIHNlZSBiZWxvdykgYW5kIGNhbiBj
YXJyeQo+IHRoZSBmaXggYXMgbmVjZXNzYXJ5Lgo+IAo+IERhbmllbCwgY2FuIHlvdSBwbGVhc2Ug
bWVyZ2UgeW91ciBmaXhlcyBicmFuY2ggaW50byB5b3VyIG1haW4gYnJhbmNoCj4gKG1heWJlIGFm
dGVyIExpbnVzIGhhcyBtZXJnZWQgaXQpIGFuZCBmaXggdGhlc2UgY29uZmxpY3RzIGNvcnJlY3Rs
eSBhcwo+IHRoZXNlIGNvbmZsaWN0cyB0ZW5kIHRvIGdvIG9uIGFuZCBvbiBhcyB0aGUgZmlsZXMg
Z2V0IGNoYW5nZWQuCgpXZWxsIHRoZSBwcm9ibGVtIGlzIHRoYXQgdGhleSBpbmRlZWQgZ28gb24g
YW5kIG9uIGFuZCB3ZSBzdGlsbCBjaGFuZ2UgdGhlbQpzbyB0aGV5IHJlc3VyZmFjZSBhbGwgdGhl
IHRpbWUuIEkndmUgZG9uZSBhIGZldyBiYWNrbWVyZ2VzIGluIG15IG5leHQKYnJhbmNoIGFscmVh
ZHksIEkgcGxhbiB0byBkbyB0aGUgbmV4dCBiYWNrbWVyZ2Ugc29tZXdoZW4gdGhpcyB3ZWVrLgoK
U29ycnkgYWJvdXQgYWxsIHRoZSBwYWluIHRoaXMgaXMgY2F1c2luZy4KLURhbmllbAoKPiAKPiAt
LSAKPiBDaGVlcnMsCj4gU3RlcGhlbiBSb3Rod2VsbCAgICAgICAgICAgICAgICAgICAgc2ZyQGNh
bmIuYXV1Zy5vcmcuYXUKPiAKPiBkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCj4gaW5kZXggODVhYzZkODVkYzM5LDAwYzYwYzFjNTE2Mi4uMDAwMDAwMDAwMDAw
Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEBAIC00ODUxLDI1IC00ODAyLDEz
ICs0ODAyLDE2IEBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKHMKPiAg
IHsKPiAgIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2Owo+ICAgCXN0cnVjdCBp
bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAtIAlzdHJ1Y3Qg
aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwo+ICsgCXN0cnVjdCBkcm1fcGxhbmUgKnA7Cj4gICAJ
aW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwo+ICAgCj4gICsJaWYgKCFpbnRlbF9jcnRjLT5h
Y3RpdmUpCj4gICsJCXJldHVybjsKPiAgKwo+IC0gCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGlu
Z19mbGlwcyhjcnRjKTsKPiAtIAo+IC0gCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7
Cj4gLSAKPiAgIAlpbnRlbF9jcnRjX2RwbXNfb3ZlcmxheV9kaXNhYmxlKGludGVsX2NydGMpOwo+
IC0gCWZvcl9lYWNoX2ludGVsX3BsYW5lKGRldiwgaW50ZWxfcGxhbmUpIHsKPiAtIAkJaWYgKGlu
dGVsX3BsYW5lLT5waXBlID09IHBpcGUpIHsKPiAtIAkJCXN0cnVjdCBkcm1fY3J0YyAqZnJvbSA9
IGludGVsX3BsYW5lLT5iYXNlLmNydGM7Cj4gICAKPiAtIAkJCWludGVsX3BsYW5lLT5kaXNhYmxl
X3BsYW5lKCZpbnRlbF9wbGFuZS0+YmFzZSwKPiAtIAkJCQkJCSAgIGZyb20gPzogY3J0YywgdHJ1
ZSk7Cj4gLSAJCX0KPiAtIAl9Cj4gKyAJZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socCwgZGV2LCBw
bGFuZV9tYXNrKQo+ICsgCQl0b19pbnRlbF9wbGFuZShwKS0+ZGlzYWJsZV9wbGFuZShwLCBjcnRj
KTsKPiAgIAo+ICAgCS8qCj4gICAJICogRklYTUU6IE9uY2Ugd2UgZ3JvdyBwcm9wZXIgbnVjbGVh
ciBmbGlwIHN1cHBvcnQgb3V0IG9mIHRoaXMgd2UgbmVlZAo+IEBAQCAtMTMzODIsNDcgLTEzNzUx
LDExICsxMzc1NywxNCBAQEAgc3RhdGljIHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3Ry
Cj4gICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKPiAgIAlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAgCXN0cnVjdCBp
bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAtIAlzdHJ1Y3Qg
aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwo+IC0gCXN0cnVjdCBkcm1fcGxhbmUgKnA7Cj4gLSAJ
dW5zaWduZWQgZmJfYml0cyA9IDA7Cj4gLSAKPiAtIAkvKiBUcmFjayBmYidzIGZvciBhbnkgcGxh
bmVzIGJlaW5nIGRpc2FibGVkICovCj4gLSAJbGlzdF9mb3JfZWFjaF9lbnRyeShwLCAmZGV2LT5t
b2RlX2NvbmZpZy5wbGFuZV9saXN0LCBoZWFkKSB7Cj4gLSAJCWludGVsX3BsYW5lID0gdG9faW50
ZWxfcGxhbmUocCk7Cj4gLSAKPiAtIAkJaWYgKGludGVsX2NydGMtPmF0b21pYy5kaXNhYmxlZF9w
bGFuZXMgJgo+IC0gCQkgICAgKDEgPDwgZHJtX3BsYW5lX2luZGV4KHApKSkgewo+IC0gCQkJc3dp
dGNoIChwLT50eXBlKSB7Cj4gLSAJCQljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Cj4gLSAJ
CQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfcGxhbmUtPnBpcGUp
Owo+IC0gCQkJCWJyZWFrOwo+IC0gCQkJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6Cj4gLSAJ
CQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihpbnRlbF9wbGFuZS0+cGlwZSk7
Cj4gLSAJCQkJYnJlYWs7Cj4gLSAJCQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Cj4gLSAJ
CQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklURShpbnRlbF9wbGFuZS0+cGlwZSk7
Cj4gLSAJCQkJYnJlYWs7Cj4gLSAJCQl9Cj4gICAKPiAtIAkJCW11dGV4X2xvY2soJmRldi0+c3Ry
dWN0X211dGV4KTsKPiAtIAkJCWk5MTVfZ2VtX3RyYWNrX2ZiKGludGVsX2ZiX29iaihwLT5mYiks
IE5VTEwsIGZiX2JpdHMpOwo+IC0gCQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7
Cj4gLSAJCX0KPiAtIAl9Cj4gLSAKPiAtIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfZm9y
X2ZsaXBzKQo+IC0gCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0Yyk7Cj4g
LSAKPiAtIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfZmJjKQo+IC0gCQlpbnRlbF9m
YmNfZGlzYWJsZShkZXYpOwo+ICsgCWlmICghbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCj4g
KyAJCWludGVsX3ByZV9wbGFuZV91cGRhdGUoaW50ZWxfY3J0Yyk7Cj4gICAKPiAgKwlpZiAoaW50
ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfaXBzKQo+ICArCQloc3dfZGlzYWJsZV9pcHMoaW50ZWxf
Y3J0Yyk7Cj4gICsKPiAtIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3ByaW1h
cnkpCj4gLSAJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7Cj4gLSAKPiAtIAlpZiAo
aW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSkKPiArIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWlj
LnVwZGF0ZV93bV9wcmUpCj4gICAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwo+ICAg
Cj4gICAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwoKCgotLSAKRGFuaWVsIFZldHRl
cgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwu
Y2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl
dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK