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 sunxi tree with the
	drm-misc tree
Date: Tue, 7 Mar 2017 10:59:06 +1100
Message-ID: <20170307105906.214e7bec@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: Maxime Ripard <maxime.ripard@free-electrons.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Cc: Chen-Yu Tsai <wens@csie.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo <shawn.guo@linaro.org>
List-Id: linux-next.vger.kernel.org

SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBzdW54aSB0cmVlIGdvdCBh
IGNvbmZsaWN0IGluOgoKICBkcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMKCmJldHdl
ZW4gY29tbWl0OgoKICA1MDQ4MGE3OGUyODIgKCJkcm06IHN1bjRpOiB1c2UgdmJsYW5rIGhvb2tz
IGluIHN0cnVjdCBkcm1fY3J0Y19mdW5jcyIpCgpmcm9tIHRoZSBkcm0tbWlzYyB0cmVlIGFuZCBj
b21taXQ6CgogIDFjMzEzYTY5ZTNlYSAoImRybS9zdW40aTogTW92ZSBsYXllcnMgZnJvbSBzdW40
aV9kcnYgdG8gc3VuNGlfY3J0YyIpCgpmcm9tIHRoZSBzdW54aSB0cmVlLgoKSSBmaXhlZCBpdCB1
cCAoc2VlIGJlbG93KSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXggYXMgbmVjZXNzYXJ5LiBUaGlzCmlz
IG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBhbnkgbm9u
IHRyaXZpYWwKY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBt
YWludGFpbmVyIHdoZW4geW91ciB0cmVlCmlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBt
YXkgYWxzbyB3YW50IHRvIGNvbnNpZGVyIGNvb3BlcmF0aW5nCndpdGggdGhlIG1haW50YWluZXIg
b2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55IHBhcnRpY3VsYXJseQpjb21w
bGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwKCmRpZmYgLS1jYyBk
cml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMKaW5kZXggOWNjZjdjNGRlYjZkLDFlYzVi
ODI1YWE2NC4uMDAwMDAwMDAwMDAwCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9k
cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMKQEBAIC0yMCwxMCAt
MjEsMzEgKzIxLDggQEBACiAgI2luY2x1ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+CiAgI2luY2x1
ZGUgPGRybS9kcm1fb2YuaD4KICAKLSAjaW5jbHVkZSAic3VuNGlfY3J0Yy5oIgogICNpbmNsdWRl
ICJzdW40aV9kcnYuaCIKICAjaW5jbHVkZSAic3VuNGlfZnJhbWVidWZmZXIuaCIKLSAjaW5jbHVk
ZSAic3VuNGlfbGF5ZXIuaCIKIC0jaW5jbHVkZSAic3VuNGlfdGNvbi5oIgogLQogLXN0YXRpYyBp
bnQgc3VuNGlfZHJ2X2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRybSwgdW5zaWdu
ZWQgaW50IHBpcGUpCiAtewogLQlzdHJ1Y3Qgc3VuNGlfZHJ2ICpkcnYgPSBkcm0tPmRldl9wcml2
YXRlOwogLQlzdHJ1Y3Qgc3VuNGlfdGNvbiAqdGNvbiA9IGRydi0+dGNvbjsKIC0KIC0JRFJNX0RF
QlVHX0RSSVZFUigiRW5hYmxpbmcgVkJMQU5LIG9uIHBpcGUgJWRcbiIsIHBpcGUpOwogLQogLQlz
dW40aV90Y29uX2VuYWJsZV92YmxhbmsodGNvbiwgdHJ1ZSk7CiAtCiAtCXJldHVybiAwOwogLX0K
IC0KIC1zdGF0aWMgdm9pZCBzdW40aV9kcnZfZGlzYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZp
Y2UgKmRybSwgdW5zaWduZWQgaW50IHBpcGUpCiAtewogLQlzdHJ1Y3Qgc3VuNGlfZHJ2ICpkcnYg
PSBkcm0tPmRldl9wcml2YXRlOwogLQlzdHJ1Y3Qgc3VuNGlfdGNvbiAqdGNvbiA9IGRydi0+dGNv
bjsKIC0KIC0JRFJNX0RFQlVHX0RSSVZFUigiRGlzYWJsaW5nIFZCTEFOSyBvbiBwaXBlICVkXG4i
LCBwaXBlKTsKIC0KIC0Jc3VuNGlfdGNvbl9lbmFibGVfdmJsYW5rKHRjb24sIGZhbHNlKTsKIC19
CiAgCiAgc3RhdGljIGNvbnN0IHN0cnVjdCBmaWxlX29wZXJhdGlvbnMgc3VuNGlfZHJ2X2ZvcHMg
PSB7CiAgCS5vd25lcgkJPSBUSElTX01PRFVMRSwKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v
bGlzdGluZm8vaW50ZWwtZ2Z4Cg==