From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Date: Wed, 22 Jun 2016 11:40:14 +1000 Message-ID: <20160622114014.19587383@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Jani Nikula , Lyude , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paulo Zanoni List-Id: dri-devel@lists.freedesktop.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKCmJl dHdlZW4gY29tbWl0OgoKICAxZTNmYTBhY2ZlYzYgKCJkcm0vaTkxNS9mYmM6IERpc2FibGUgb24g SFNXIGJ5IGRlZmF1bHQgZm9yIG5vdyIpCgpmcm9tIHRoZSBkcm0taW50ZWwtZml4ZXMgdHJlZSBh bmQgY29tbWl0OgoKICA4MDc4OGEwZmJiZGYgKCJkcm0vaTkxNS9mYmM6IHNhbml0aXplIGk5MTUu ZW5hYmxlX2ZiYyBkdXJpbmcgRkJDIGluaXQiKQoKZnJvbSB0aGUgZHJtLWludGVsIHRyZWUuCgpJ IGZpeGVkIGl0IHVwIChzaW5jZSB0aGUgZm9ybWVyIHBhdGNoIGFwcGVhcnMgb24gYm90aCB0cmVl cywgSSBqdXN0CnVzZWQgdGhlIGxhdHRlcikgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFzIG5lY2Vz c2FyeS4gVGhpcyBpcyBub3cgZml4ZWQKYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29uY2VybmVk LCBidXQgYW55IG5vbiB0cml2aWFsIGNvbmZsaWN0cyBzaG91bGQKYmUgbWVudGlvbmVkIHRvIHlv dXIgdXBzdHJlYW0gbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZSBpcyBzdWJtaXR0ZWQgZm9yCm1l cmdpbmcuICBZb3UgbWF5IGFsc28gd2FudCB0byBjb25zaWRlciBjb29wZXJhdGluZyB3aXRoIHRo ZSBtYWludGFpbmVyCm9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvIG1pbmltaXNlIGFueSBwYXJ0 aWN1bGFybHkgY29tcGxleCBjb25mbGljdHMuCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJvdGh3ZWxs Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=