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: Wed, 22 Mar 2017 11:00:50 +1100
Message-ID: <20170322110050.1e2ea77d@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>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

SGkgRGF2ZSwKClRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUgZHJtIHRyZWUgZ290IGEg
Y29uZmxpY3QgaW46CgogIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMK
CmJldHdlZW4gY29tbWl0OgoKICAzZDNkMThmMDg2Y2QgKCJkcm0vaTkxNTogQXZvaWQgcmN1X2Jh
cnJpZXIoKSBmcm9tIHJlY2xhaW0gcGF0aHMgKHNocmlua2VyKSIpCgpmcm9tIHRoZSBkcm0taW50
ZWwtZml4ZXMgdHJlZSBhbmQgY29tbWl0OgoKICA1MTlkNTI0OTgxNTYgKCJkcm0vaTkxNTogaTkx
NV9nZW1fc2hyaW5rX2FsbCgpIG5lZWRzIGFuIGF3YWtlIGRldmljZSIpCgpmcm9tIHRoZSBkcm0g
dHJlZS4KCkkgZml4ZWQgaXQgdXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFz
IG5lY2Vzc2FyeS4gVGhpcwppcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29u
Y2VybmVkLCBidXQgYW55IG5vbiB0cml2aWFsCmNvbmZsaWN0cyBzaG91bGQgYmUgbWVudGlvbmVk
IHRvIHlvdXIgdXBzdHJlYW0gbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZQppcyBzdWJtaXR0ZWQg
Zm9yIG1lcmdpbmcuICBZb3UgbWF5IGFsc28gd2FudCB0byBjb25zaWRlciBjb29wZXJhdGluZwp3
aXRoIHRoZSBtYWludGFpbmVyIG9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvIG1pbmltaXNlIGFu
eSBwYXJ0aWN1bGFybHkKY29tcGxleCBjb25mbGljdHMuCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJv
dGh3ZWxsCgpkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIu
YwppbmRleCBkNWQyYjRjNmVkMzgsMDA2YThiOTA4Zjc3Li4wMDAwMDAwMDAwMDAKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCkBAQCAtMjYzLDcgLTI2NCw5ICsyNjQsOSBAQEAg
dW5zaWduZWQgbG9uZyBpOTE1X2dlbV9zaHJpbmtfYWxsKHN0cnVjCiAgCQkJCUk5MTVfU0hSSU5L
X0JPVU5EIHwKICAJCQkJSTkxNV9TSFJJTktfVU5CT1VORCB8CiAgCQkJCUk5MTVfU0hSSU5LX0FD
VElWRSk7CisgCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKKyAKIC0JcmN1X2JhcnJp
ZXIoKTsgLyogd2FpdCB1bnRpbCBvdXIgUkNVIGRlbGF5ZWQgc2xhYiBmcmVlcyBhcmUgY29tcGxl
dGVkICovCiArCXN5bmNocm9uaXplX3JjdSgpOyAvKiB3YWl0IGZvciBvdXIgZWFybGllciBSQ1Ug
ZGVsYXllZCBzbGFiIGZyZWVzICovCiAgCiAgCXJldHVybiBmcmVlZDsKICB9Cl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp
c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=