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 tree with the drm-intel-fixes tree
Date: Fri, 21 Jul 2017 11:26:07 +1000
Message-ID: <20170721112607.63ac1237@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: Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Cc: Jani Nikula <jani.nikula@intel.com>, Mahesh Kumar <mahesh1.kumar@intel.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
List-Id: linux-next.vger.kernel.org

SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0gdHJlZSBnb3QgYSBj
b25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwoKYmV0d2VlbiBj
b21taXQ6CgogIDljYzViYjE4YmQwYSAoImRybS9pOTE1OiBGaXggYmFkIGNvbXBhcmlzb24gaW4g
c2tsX2NvbXB1dGVfcGxhbmVfd20iKQoKZnJvbSB0aGUgZHJtLWludGVsLWZpeGVzIHRyZWUgYW5k
IGNvbW1pdDoKCiAgZWFjMmNiODFmYjg3ICgiZHJtL2k5MTU6IGNsZWFudXAgZml4ZWQtcG9pbnQg
d3JhcHBlcnMgbmFtaW5nIikKCmZyb20gdGhlIGRybSB0cmVlLgoKSSBmaXhlZCBpdCB1cCAoc2Vl
IGJlbG93KSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXggYXMgbmVjZXNzYXJ5LiBUaGlzCmlzIG5vdyBm
aXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBhbnkgbm9uIHRyaXZp
YWwKY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBtYWludGFp
bmVyIHdoZW4geW91ciB0cmVlCmlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxz
byB3YW50IHRvIGNvbnNpZGVyIGNvb3BlcmF0aW5nCndpdGggdGhlIG1haW50YWluZXIgb2YgdGhl
IGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55IHBhcnRpY3VsYXJseQpjb21wbGV4IGNv
bmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwKCmRpZmYgLS1jYyBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDQwYjIyNGI0NGQxYixlZTJhMzQ5Y2ZlNjgu
LjAwMDAwMDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEBAIC00NDYzLDExIC00NDU5LDExICs0
NDU5LDExIEBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHMKICAJCWlm
ICgoY3BwICogY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWwgLyA1MTIgPCAx
KSAmJgogIAkJICAgIChwbGFuZV9ieXRlc19wZXJfbGluZSAvIDUxMiA8IDEpKQogIAkJCXNlbGVj
dGVkX3Jlc3VsdCA9IG1ldGhvZDI7CiAtCQllbHNlIGlmICgoZGRiX2FsbG9jYXRpb24gJiYgZGRi
X2FsbG9jYXRpb24gLwogLQkJCWZpeGVkMTZfdG9fdTMyX3JvdW5kX3VwKHBsYW5lX2Jsb2Nrc19w
ZXJfbGluZSkpID49IDEpCiArCQllbHNlIGlmIChkZGJfYWxsb2NhdGlvbiA+PQotIAkJCSBmaXhl
ZF8xNl8xNl90b191MzJfcm91bmRfdXAocGxhbmVfYmxvY2tzX3Blcl9saW5lKSkKLSAJCQlzZWxl
Y3RlZF9yZXN1bHQgPSBtaW5fZml4ZWRfMTZfMTYobWV0aG9kMSwgbWV0aG9kMik7CisrCQkJIGZp
eGVkMTZfdG9fdTMyX3JvdW5kX3VwKHBsYW5lX2Jsb2Nrc19wZXJfbGluZSkpCisgCQkJc2VsZWN0
ZWRfcmVzdWx0ID0gbWluX2ZpeGVkMTYobWV0aG9kMSwgbWV0aG9kMik7CiAgCQllbHNlIGlmIChs
YXRlbmN5ID49IGxpbmV0aW1lX3VzKQotIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1pbl9maXhlZF8x
Nl8xNihtZXRob2QxLCBtZXRob2QyKTsKKyAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtaW5fZml4ZWQx
NihtZXRob2QxLCBtZXRob2QyKTsKICAJCWVsc2UKICAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtZXRo
b2QxOwogIAl9Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo
dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=