From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Date: Thu, 24 Sep 2015 11:57:05 +0300 Message-ID: <876130dwke.fsf@intel.com> References: <20150924112516.1dc9d5d3@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150924112516.1dc9d5d3@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAyNCBTZXAgMjAxNSwgU3RlcGhlbiBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcu YXU+IHdyb3RlOgo+IEhpIGFsbCwKPgo+IFRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUg ZHJtLWludGVsIHRyZWUgZ290IGEgY29uZmxpY3QgaW46Cj4KPiAgIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwo+Cj4gYmV0d2VlbiBjb21taXQ6Cj4KPiAgIDcyMWEwOWY3Mzkz ZCAoImRybS9pOTE1OiBBZGQgcHJpbWFyeSBwbGFuZSB0byBtYXNrIGlmIGl0J3MgdmlzaWJsZSIp Cj4KPiBmcm9tIHRoZSBkcm0taW50ZWwtZml4ZXMgdHJlZSBhbmQgY29tbWl0Ogo+Cj4gICBmOWNk N2I4ODFhMDQgKCJkcm0vaTkxNTogTW92ZSBzcHJpdGUvY3Vyc29yIHBsYW5lIGRpc2FibGUgdG8g aW50ZWxfc2FuaXRpemVfY3J0YygpIikKPgo+IGZyb20gdGhlIGRybS1pbnRlbCB0cmVlLgo+Cj4g SSBmaXhlZCBpdCB1cCAoSSBoYXZlIG5vIGlkZWEgd2hhdCBkbyB0byBoZXJlLCBzbyBJIGp1c3Qg dXNlZCB0aGUgdmVyc2lvbgo+IGZyb20gdGhlIGRybS1pbnRlbCB0cmVlKSBhbmQgY2FuIGNhcnJ5 IHRoZSBmaXggYXMgbmVjZXNzYXJ5IChubyBhY3Rpb24KPiBpcyByZXF1aXJlZCAtIHVubGVzcyB0 aGVyZSBpcyBhIGJldHRlciBmaXgpLgoKVGhhdCB3YXMgdGhlIHJpZ2h0IHRoaW5nIHRvIGRvLgoK VGhlIGZvcm1lciBjb21taXQgaXMgaGVhZGVkIGZvciB2NC4zLCBhbmQgdGhlcmUgd2lsbCBoYXZl IHRvIGJlIGFub3RoZXIKdmVyc2lvbiBvZiBpdCBmb3IgLW5leHQuIFRoaXMgd2lsbCBjYXVzZSB5 b3UgYW5vdGhlciBjb25mbGljdCwgYW5kIHlvdQpzaG91bGQgcmVzb2x2ZSBpdCB3aXRoIHRoZSBz YW1lIGFwcHJvYWNoLgoKVGhhbmtzLApKYW5pLgoKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3Bl biBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK