From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: manual merge of the drm-intel tree with the
 drm-intel-fixes tree
Date: Tue, 21 Mar 2017 11:37:07 +1100
Message-ID: <20170321113707.69d3c689@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>
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: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Cc: Chuanxiao Dong <chuanxiao.dong@intel.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: dri-devel@lists.freedesktop.org

SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn
b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5j
CgpiZXR3ZWVuIGNvbW1pdDoKCiAgM2NkMjNiODI4YjM3ICgiZHJtL2k5MTUvZ3Z0OiBHVlQgcGlu
L3VucGluIHNoYWRvdyBjb250ZXh0IikKCmZyb20gdGhlIGRybS1pbnRlbC1maXhlcyB0cmVlIGFu
ZCBjb21taXQ6CgogIGU2NDJjODViMDNkZSAoImRybS9pOTE1OiBSZW1vdmUgc3VwZXJmbHVvdXMg
aTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaCgpIGhlbHBlciIpCgpmcm9tIHRoZSBkcm0taW50ZWwg
dHJlZS4KCkkgZml4ZWQgaXQgdXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFz
IG5lY2Vzc2FyeS4gVGhpcwppcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29u
Y2VybmVkLCBidXQgYW55IG5vbiB0cml2aWFsCmNvbmZsaWN0cyBzaG91bGQgYmUgbWVudGlvbmVk
IHRvIHlvdXIgdXBzdHJlYW0gbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZQppcyBzdWJtaXR0ZWQg
Zm9yIG1lcmdpbmcuICBZb3UgbWF5IGFsc28gd2FudCB0byBjb25zaWRlciBjb29wZXJhdGluZwp3
aXRoIHRoZSBtYWludGFpbmVyIG9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvIG1pbmltaXNlIGFu
eSBwYXJ0aWN1bGFybHkKY29tcGxleCBjb25mbGljdHMuCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJv
dGh3ZWxsCgpkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5jCmlu
ZGV4IDM5YTgzZWI3YWVjYywzMWQyMjQwZmRiMWYuLjAwMDAwMDAwMDAwMAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9ndnQvc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
Z3Z0L3NjaGVkdWxlci5jCkBAQCAtMjQ2LDEwIC0yMTIsNyArMjQ0LDEwIEBAQCBvdXQKICAJCXdv
cmtsb2FkLT5zdGF0dXMgPSByZXQ7CiAgCiAgCWlmICghSVNfRVJSX09SX05VTEwocnEpKQotIAkJ
aTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChycSk7CisgCQlpOTE1X2FkZF9yZXF1ZXN0KHJxKTsK
ICsJZWxzZQogKwkJZW5naW5lLT5jb250ZXh0X3VucGluKGVuZ2luZSwgc2hhZG93X2N0eCk7CiAr
CiAgCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogIAlyZXR1cm4g
cmV0OwogIH0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K
ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0
dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==