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 tree with the
 drm-intel-fixes tree
Date: Wed, 22 Mar 2017 10:57:24 +1100
Message-ID: <20170322105724.0fbf52bc@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Cc: Jani Nikula <jani.nikula@intel.com>, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
List-Id: linux-next.vger.kernel.org

SGkgRGF2ZSwKClRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUgZHJtIHRyZWUgZ290IGEg
Y29uZmxpY3QgaW46CgogIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwoK
YmV0d2VlbiBjb21taXQ6CgogIDU5MDM3OWFlZjJlMyAoImRybS9pOTE1OiBtYWtlIGNvbnRleHQg
c3RhdHVzIG5vdGlmaWVyIGhlYWQgYmUgcGVyIGVuZ2luZSIpCgpmcm9tIHRoZSBkcm0taW50ZWwt
Zml4ZXMgdHJlZSBhbmQgY29tbWl0czoKCiAgMjM1NWNmMDg4ZDQ2ICgiZHJtL2k5MTU6IENyZWF0
ZSBjb250ZXh0IGRlc2MgdGVtcGxhdGUgd2hlbiBjb250ZXh0IGlzIGNyZWF0ZWQiKQogIDk0OWU4
YWIzYTk0YiAoImRybS9pOTE1OiBVc2UgdGhlIHNpemUvdHlwZSBvZiBhZGRyZXNzIHNwYWNlIHRv
IG1ha2UgZGVjaXNpb25zIikKCmZyb20gdGhlIGRybSB0cmVlLgoKSSBmaXhlZCBpdCB1cCAoc2Vl
IGJlbG93KSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXggYXMgbmVjZXNzYXJ5LiBUaGlzCmlzIG5vdyBm
aXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBhbnkgbm9uIHRyaXZp
YWwKY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBtYWludGFp
bmVyIHdoZW4geW91ciB0cmVlCmlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxz
byB3YW50IHRvIGNvbnNpZGVyIGNvb3BlcmF0aW5nCndpdGggdGhlIG1haW50YWluZXIgb2YgdGhl
IGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55IHBhcnRpY3VsYXJseQpjb21wbGV4IGNv
bmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwKCmRpZmYgLS1jYyBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZTJkODNiNmQzNzZiLGJhY2Vj
YTE0ZjVlMC4uMDAwMDAwMDAwMDAwCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK
QEBAIC0zMDksOCAtMzE2LDkgKzMxNiw4IEBAQCBfX2NyZWF0ZV9od19jb250ZXh0KHN0cnVjdCBk
cm1faTkxNV9wcmkKICAKICAJaTkxNV9nZW1fY29udGV4dF9zZXRfYmFubmFibGUoY3R4KTsKICAJ
Y3R4LT5yaW5nX3NpemUgPSA0ICogUEFHRV9TSVpFOwotIAljdHgtPmRlc2NfdGVtcGxhdGUgPSBH
RU44X0NUWF9BRERSRVNTSU5HX01PREUoZGV2X3ByaXYpIDw8Ci0gCQkJICAgICBHRU44X0NUWF9B
RERSRVNTSU5HX01PREVfU0hJRlQ7CisgCWN0eC0+ZGVzY190ZW1wbGF0ZSA9CisgCQlkZWZhdWx0
X2Rlc2NfdGVtcGxhdGUoZGV2X3ByaXYsIGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dCk7CiAt
CUFUT01JQ19JTklUX05PVElGSUVSX0hFQUQoJmN0eC0+c3RhdHVzX25vdGlmaWVyKTsKICAKICAJ
LyogR3VDIHJlcXVpcmVzIHRoZSByaW5nIHRvIGJlIHBsYWNlZCBhYm92ZSBHVUNfV09QQ01fVE9Q
LiBJZiBHdUMgaXMgbm90CiAgCSAqIHByZXNlbnQgb3Igbm90IGluIHVzZSB3ZSBzdGlsbCBuZWVk
IGEgc21hbGwgYmlhcyBhcyByaW5nIHdyYXBhcm91bmQKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt
YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==