From mboxrd@z Thu Jan  1 00:00:00 1970
From: michael@ozlabs.org (mpe@ellerman.id.au)
Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Fri,  5 Jun 2015 15:46:34 +1000 (AEST)
Message-ID: <20150605054634.E4FA3140218@ozlabs.org>
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: Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, 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
Y29uZmxpY3QgaW4KZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGJldHdl
ZW4gY29tbWl0IDRmNDdjOTlhOWJlNyAoImRybS9pOTE1OgpNb3ZlIFdhQmFycmllclBlcmZvcm1h
bmNlRml4RGlzYWJsZTpza2wgdG8gc2tsIGNvZGUgZnJvbSBjaHYgY29kZSIpIGZyb20gdGhlCmRy
bS1pbnRlbC1maXhlcyB0cmVlIGFuZCBjb21taXQgYjYyYWRiZDFlYTFmICgiZHJtL2k5MTUvYnh0
OiBNb3ZlCldhRm9yY2VFbmFibGVOb25Db2hlcmVudCB0byBTa3lsYWtlIG9ubHkiKSBmcm9tIHRo
ZSBkcm0gdHJlZS4KCkkgZml4ZWQgaXQgdXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUg
Zml4IGFzIG5lY2Vzc2FyeSAobm8gYWN0aW9uCmlzIHJlcXVpcmVkKS4KCmNoZWVycwoKZGlmZiAt
LWNjIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCAwMDViNWUw
NGRlNGQsZDkzNGY4NTczOTRkLi4wMDAwMDAwMDAwMDAKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuYwpAQEAgLTEwMTcsMTMgLTEwMzAsMTcgKzEwMjMsMjQgQEBAIHN0YXRpYyBpbnQg
c2tsX2luaXRfd29ya2Fyb3VuZHMoc3RydWN0IAogIAkJV0FfU0VUX0JJVF9NQVNLRUQoSElaX0NI
SUNLRU4sCiAgCQkJCSAgQkRXX0hJWl9QT1dFUl9DT01QSUxFUl9DTE9DS19HQVRJTkdfRElTQUJM
RSk7CiAgCiArCWlmIChJTlRFTF9SRVZJRChkZXYpID09IFNLTF9SRVZJRF9DMCB8fAogKwkgICAg
SU5URUxfUkVWSUQoZGV2KSA9PSBTS0xfUkVWSURfRDApCiArCQkvKiBXYUJhcnJpZXJQZXJmb3Jt
YW5jZUZpeERpc2FibGU6c2tsICovCiArCQlXQV9TRVRfQklUX01BU0tFRChIRENfQ0hJQ0tFTjAs
CiArCQkJCSAgSERDX0ZFTkNFX0RFU1RfU0xNX0RJU0FCTEUgfAogKwkJCQkgIEhEQ19CQVJSSUVS
X1BFUkZPUk1BTkNFX0RJU0FCTEUpOwogKworIAlpZiAoSU5URUxfUkVWSUQoZGV2KSA8PSBTS0xf
UkVWSURfRDApIHsKKyAJCS8qCisgCQkgKlVzZSBGb3JjZSBOb24tQ29oZXJlbnQgd2hlbmV2ZXIg
ZXhlY3V0aW5nIGEgM0QgY29udGV4dC4gVGhpcworIAkJICogaXMgYSB3b3JrYXJvdW5kIGZvciBh
IHBvc3NpYmxlIGhhbmcgaW4gdGhlIHVubGlrZWx5IGV2ZW50CisgCQkgKiBhIFRMQiBpbnZhbGlk
YXRpb24gb2NjdXJzIGR1cmluZyBhIFBTRCBmbHVzaC4KKyAJCSAqLworIAkJLyogV2FGb3JjZUVu
YWJsZU5vbkNvaGVyZW50OnNrbCAqLworIAkJV0FfU0VUX0JJVF9NQVNLRUQoSERDX0NISUNLRU4w
LAorIAkJCQkgIEhEQ19GT1JDRV9OT05fQ09IRVJFTlQpOworIAl9CisgCiAgCXJldHVybiBza2xf
dHVuZV9pel9oYXNoaW5nKHJpbmcpOwogIH0KICAKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s
aXN0aW5mby9kcmktZGV2ZWwK