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-misc tree with the drm-intel
 tree
Date: Tue, 3 May 2016 09:54:55 +0200
Message-ID: <20160503075455.GZ14148@phenom.ffwll.local>
References: <20160503132412.30a61b5c@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: <20160503132412.30a61b5c@canb.auug.org.au>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

T24gVHVlLCBNYXkgMDMsIDIwMTYgYXQgMDE6MjQ6MTJQTSArMTAwMCwgU3RlcGhlbiBSb3Rod2Vs
bCB3cm90ZToKPiBIaSBhbGwsCj4gCj4gVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBk
cm0tbWlzYyB0cmVlIGdvdCBhIGNvbmZsaWN0IGluOgo+IAo+ICAgZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jCj4gCj4gYmV0d2VlbiBjb21taXRzOgo+IAo+ICAgZjdlNTgzOGJi
MzdkICgiZHJtL2k5MTU6IFNpbXBsaWZ5IHJlc2V0X2NvdW50ZXIgaGFuZGxpbmcgZHVyaW5nIGF0
b21pYyBtb2Rlc2V0dGluZyIpCj4gCj4gZnJvbSB0aGUgZHJtLWludGVsIHRyZWUgYW5kIGNvbW1p
dDoKPiAKPiAgIDgxMDcyYmZkMTNmMiAoImRybS9pOTE1OiBSZW5hbWUgYXN5bmMgdG8gbm9uYmxv
Y2suIikKPiAKPiBmcm9tIHRoZSBkcm0tbWlzYyB0cmVlLgo+IAo+IEkgZml4ZWQgaXQgdXAgKHNl
ZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFzIG5lY2Vzc2FyeS4gVGhpcwo+IGlzIG5v
dyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBhbnkgbm9uIHRy
aXZpYWwKPiBjb25mbGljdHMgc2hvdWxkIGJlIG1lbnRpb25lZCB0byB5b3VyIHVwc3RyZWFtIG1h
aW50YWluZXIgd2hlbiB5b3VyIHRyZWUKPiBpcyBzdWJtaXR0ZWQgZm9yIG1lcmdpbmcuICBZb3Ug
bWF5IGFsc28gd2FudCB0byBjb25zaWRlciBjb29wZXJhdGluZwo+IHdpdGggdGhlIG1haW50YWlu
ZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55IHBhcnRpY3VsYXJseQo+
IGNvbXBsZXggY29uZmxpY3RzLgoKUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52
ZXR0ZXJAZmZ3bGwuY2g+CgpJIGtpbmRhIHdvbmRlciB3aGV0aGVyIHRoZXJlJ3Mgc29tZSB3YXkg
d2UgY291bGQgc2hhcmUgdGhlc2UgY29uZmxpY3QKcmVzb2x1dGlvbnMgYW1vbmcgdmFyaW91cyB0
cmVlcy4gQXQgbGVhc3Qgb25lIHJlYWxseSB2YWx1YWJsZSBwYXJ0IG9mCmRvaW5nIG15IG93biBk
cm0taW50ZWwtbmlnaHRseSBpbnRlZ3JhdGlvbiB0cmVlIGlzIHRoYXQgSSBjYW4gc29hayBtZXJn
ZXMKZm9yIGEgZmV3IGRheXMgYmVmb3JlIEkgYmFrZSB0aGVtIGluIGZvciBldGVybml0eSAuLi4K
ClRvcGljIGZvciBLUyBJIGd1ZXNzPwoKQ2hlZXJzLCBEYW5pZWwKCj4gCj4gLS0gCj4gQ2hlZXJz
LAo+IFN0ZXBoZW4gUm90aHdlbGwKPiAKPiBkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCj4gaW5kZXggZmY2MDI0MWIxZjc2LDVkMjliODM4ZDhkNy4uMDAwMDAw
MDAwMDAwCj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEBAIC0xMzQ2Miw5IC0x
MzQxNCwxMiArMTM0NjIsOSBAQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21t
aXQoCj4gICAJCXJldHVybiByZXQ7Cj4gICAKPiAgIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9w
cmVwYXJlX3BsYW5lcyhkZXYsIHN0YXRlKTsKPiAgLQlpZiAoIXJldCAmJiAhbm9uYmxvY2sgJiYg
IWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVfZXJyb3IpKSB7Cj4gIC0JCXUz
MiByZXNldF9jb3VudGVyOwo+ICAtCj4gIC0JCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgm
ZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKPiAgLQkJbXV0ZXhfdW5sb2NrKCZk
ZXYtPnN0cnVjdF9tdXRleCk7Cj4gICsJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7
Cj4gICAKPiAtIAlpZiAoIXJldCAmJiAhYXN5bmMpIHsKPiArKwlpZiAoIXJldCAmJiAhbm9uYmxv
Y2spIHsKPiAgIAkJZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwbGFuZV9z
dGF0ZSwgaSkgewo+ICAgCQkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wbGFuZV9z
dGF0ZSA9Cj4gICAJCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpOwoKLS0gCkRh
bmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9i
bG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl
bAo=