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, 24 Aug 2016 11:42:06 +1000 Message-ID: <20160824114206.17c98d9d@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: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CgpiZXR3ZWVuIGNvbW1pdHMgZnJvbSB0aGUgZHJtLWludGVsLWZpeGVzIHRyZWUgKHNvbWUgb2Yg d2hpY2ggYXJlCmNoZXJyeS1waWNrZWQgZnJvbSB0aGUgZHJtLWludGVsIHRyZWUpIGFuZCB0ZWgg c2FtZSBhbmQgb3RoZXIgY29tbWl0cwpmcm9tIHRoZSBkcm0taW50ZSB0cmVlLiAgVGhlc2UgYXJl IGp1c3QgZ29pbmcgdG8gY2F1c2UgbmV3IGNvbmZsaWN0cwpldmVyeSB0aW1lIHlvdSB0b3VjaCB0 aGlzIGZpbGUgYWdhaW4gaW4gZWl0aGVyIHRyZWUgKHdoaWNoIGhhcHBlbnMgYQpsb3QgOi0oKS4K CkkgZml4ZWQgaXQgdXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFzIG5lY2Vz c2FyeS4gVGhpcwppcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29uY2VybmVk LCBidXQgYW55IG5vbiB0cml2aWFsCmNvbmZsaWN0cyBzaG91bGQgYmUgbWVudGlvbmVkIHRvIHlv dXIgdXBzdHJlYW0gbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZQppcyBzdWJtaXR0ZWQgZm9yIG1l cmdpbmcuICBZb3UgbWF5IGFsc28gd2FudCB0byBjb25zaWRlciBvbmx5IHB1dHRpbmcKdGhlIGZp eCBwYXRjaGVzIGludG8gdGhlIGRybS1pbnRlbC1maXhlcyB0cmVlIGFuZCB0aGVuIGdldHRpbmcg dGhlbQppbnRvIHRoZSBkcm0taW50ZWwgdHJlZSBieSBtZXJnaW5nIHRoZSAtZml4ZXMgdHJlZSBp bnN0ZWFkIG9mCmNoZXJyeS1waWNraW5nIHRoZW0gdGhlIG90aGVyIHdheS4KCi0tIApDaGVlcnMs ClN0ZXBoZW4gUm90aHdlbGwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==