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-misc tree with Linus' tree
Date: Mon, 14 Dec 2015 12:12:05 +1100
Message-ID: <20151214121205.7323fbd7@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: <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: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Thomas Hellstrom <thellstrom@vmware.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: intel-gfx@lists.freedesktop.org

SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0tbWlzYyB0cmVlIGdv
dCBjb25mbGljdHMgaW46CgogIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2xkdS5jCiAg
ZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jCiAgZHJpdmVycy9ncHUvZHJtL3Zt
d2dmeC92bXdnZnhfc3RkdS5jCgpiZXR3ZWVuIGNvbW1pdDoKCiAgOGZiZjlkOTJhN2JjICgiZHJt
L3Ztd2dmeDogSW1wbGVtZW50IHRoZSBjdXJzb3Jfc2V0MiBjYWxsYmFjayB2MiIpCgpmcm9tIExp
bnVzJyB0cmVlIGFuZCBjb21taXQ6CgogIGY4MGRlNjZlY2E2NSAoImRybS92bXdnZng6IERyb3Ag
ZHVtbXkgc2F2ZS9yZXN0b3JlIGhvb2tzIikKCmZyb20gdGhlIGRybS1taXNjIHRyZWUuCgpJIGZp
eGVkIGl0IHVwIChzZWUgYmVsb3cpIGFuZCBjYW4gY2FycnkgdGhlIGZpeCBhcyBuZWNlc3Nhcnkg
KG5vIGFjdGlvbgppcyByZXF1aXJlZCkuCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJvdGh3ZWxsICAg
ICAgICAgICAgICAgICAgICBzZnJAY2FuYi5hdXVnLm9yZy5hdQoKZGlmZiAtLWNjIGRyaXZlcnMv
Z3B1L2RybS92bXdnZngvdm13Z2Z4X2xkdS5jCmluZGV4IDUyY2FlY2I0NTAyZSwyYWZmNWU1MWQ5
MjYuLjAwMDAwMDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9sZHUu
YworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9sZHUuYwpAQEAgLTI5NSw5IC0y
OTUsNyArMjk1LDcgQEBAIHN0YXRpYyBpbnQgdm13X2xkdV9jcnRjX3NldF9jb25maWcoc3RydQog
IH0KICAKICBzdGF0aWMgc3RydWN0IGRybV9jcnRjX2Z1bmNzIHZtd19sZWdhY3lfY3J0Y19mdW5j
cyA9IHsKLSAJLnNhdmUgPSB2bXdfZHVfY3J0Y19zYXZlLAotIAkucmVzdG9yZSA9IHZtd19kdV9j
cnRjX3Jlc3RvcmUsCiAtCS5jdXJzb3Jfc2V0ID0gdm13X2R1X2NydGNfY3Vyc29yX3NldCwKICsJ
LmN1cnNvcl9zZXQyID0gdm13X2R1X2NydGNfY3Vyc29yX3NldDIsCiAgCS5jdXJzb3JfbW92ZSA9
IHZtd19kdV9jcnRjX2N1cnNvcl9tb3ZlLAogIAkuZ2FtbWFfc2V0ID0gdm13X2R1X2NydGNfZ2Ft
bWFfc2V0LAogIAkuZGVzdHJveSA9IHZtd19sZHVfY3J0Y19kZXN0cm95LApkaWZmIC0tY2MgZHJp
dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jCmluZGV4IDEzOTI2ZmYxOTJlMyw2YmI3
YWYzNzkzNGEuLjAwMDAwMDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dm
eF9zY3JuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jCkBAQCAt
NTMxLDkgLTUzMSw3ICs1MzEsNyBAQEAgb3V0X25vX2ZlbmNlCiAgfQogIAogIHN0YXRpYyBzdHJ1
Y3QgZHJtX2NydGNfZnVuY3Mgdm13X3NjcmVlbl9vYmplY3RfY3J0Y19mdW5jcyA9IHsKLSAJLnNh
dmUgPSB2bXdfZHVfY3J0Y19zYXZlLAotIAkucmVzdG9yZSA9IHZtd19kdV9jcnRjX3Jlc3RvcmUs
CiAtCS5jdXJzb3Jfc2V0ID0gdm13X2R1X2NydGNfY3Vyc29yX3NldCwKICsJLmN1cnNvcl9zZXQy
ID0gdm13X2R1X2NydGNfY3Vyc29yX3NldDIsCiAgCS5jdXJzb3JfbW92ZSA9IHZtd19kdV9jcnRj
X2N1cnNvcl9tb3ZlLAogIAkuZ2FtbWFfc2V0ID0gdm13X2R1X2NydGNfZ2FtbWFfc2V0LAogIAku
ZGVzdHJveSA9IHZtd19zb3VfY3J0Y19kZXN0cm95LApkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJt
L3Ztd2dmeC92bXdnZnhfc3RkdS5jCmluZGV4IGY4MjNmYzNlZmVkNyw0NWU3MmMyZjE1Y2QuLjAw
MDAwMDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc3RkdS5jCkBAQCAtMTA0MSw5IC0xMDQx
LDcgKzEwNDEsNyBAQEAgb3V0X2ZpbmlzaAogICAqICBTY3JlZW4gVGFyZ2V0IENSVEMgZGlzcGF0
Y2ggdGFibGUKICAgKi8KICBzdGF0aWMgc3RydWN0IGRybV9jcnRjX2Z1bmNzIHZtd19zdGR1X2Ny
dGNfZnVuY3MgPSB7Ci0gCS5zYXZlID0gdm13X2R1X2NydGNfc2F2ZSwKLSAJLnJlc3RvcmUgPSB2
bXdfZHVfY3J0Y19yZXN0b3JlLAogLQkuY3Vyc29yX3NldCA9IHZtd19kdV9jcnRjX2N1cnNvcl9z
ZXQsCiArCS5jdXJzb3Jfc2V0MiA9IHZtd19kdV9jcnRjX2N1cnNvcl9zZXQyLAogIAkuY3Vyc29y
X21vdmUgPSB2bXdfZHVfY3J0Y19jdXJzb3JfbW92ZSwKICAJLmdhbW1hX3NldCA9IHZtd19kdV9j
cnRjX2dhbW1hX3NldCwKICAJLmRlc3Ryb3kgPSB2bXdfc3RkdV9jcnRjX2Rlc3Ryb3ksCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls
aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==