From mboxrd@z Thu Jan  1 00:00:00 1970
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: Re: [PATCH] drm/plane-helper: Fixup mismerge
Date: Wed, 11 Mar 2015 19:53:45 +0200
Message-ID: <3102478.0Dijh2RzTl@avalon>
References: <1426060826-17077-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from galahad.ideasonboard.com (galahad.ideasonboard.com
 [185.26.127.97])
 by gabe.freedesktop.org (Postfix) with ESMTP id B99626E8BD
 for <dri-devel@lists.freedesktop.org>; Wed, 11 Mar 2015 10:53:42 -0700 (PDT)
In-Reply-To: <1426060826-17077-1-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>, Dan Carpenter <dan.carpenter@oracle.com>, DRI Development <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

SGkgRGFuaWVsLAoKVGhhbmsgeW91IGZvciB0aGUgcGF0Y2guCgpPbiBXZWRuZXNkYXkgMTEgTWFy
Y2ggMjAxNSAwOTowMDoyNiBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+IEkgc29tZWhvdyBtYW5hZ2Ug
dG8gc2NyZXcgdXAgYXBwbHlpbmcgTGF1cmVudCdzIHBhdGNoIGluIGVjYTkzZTI4YzI1NjoKPiAi
ZHJtOiBDaGVjayBpbiBzZXRjcnRjIGlmIHRoZSBwcmltYXJ5IHBsYW5lIHN1cHBvcnRzIHRoZSBm
YiBwaXhlbAo+IGZvcm1hdCIuIEl0IHdhcyBhIGNvbmZsaWN0IHdpdGgKPiAKPiBjb21taXQgMzQ2
MWIzMGIzZTE3MWUxNjQ5OGYzZDdiYzU5YWI3MDNhZWM0NzVjOAo+IEF1dGhvcjogRGFuaWVsIFZl
dHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiBEYXRlOiAgIFRodSBNYXIgNSAxMDozMjo0
NCAyMDE1ICswMTAwCj4gCj4gICAgIGRybS9wbGFuZS1oZWxwZXI6IHVuZXhwb3J0IGRybV9wcmlt
YXJ5X2hlbHBlcl9jcmVhdGVfcGxhbmUKPiAKPiBhbmQgSSBqdXN0IGRpZG4ndCBjaGVjayB0aGF0
IHRoZSBzb2x1dGlvbiBmcm9tIHdpZ2dsZSBtYWRlIHNlbnNlLgo+IAo+IENjOiBEYW4gQ2FycGVu
dGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+Cj4gQ2M6IGxhdXJlbnQucGluY2hhcnRAaWRl
YXNvbmJvYXJkLmNvbQo+IFJlcG9ydGVkLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVy
QG9yYWNsZS5jb20+Cj4gU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRl
ckBpbnRlbC5jb20+CgpBY2tlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFy
dEBpZGVhc29uYm9hcmQuY29tPgoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZV9o
ZWxwZXIuYyB8IDExICsrKysrKy0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMo
KyksIDUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f
cGxhbmVfaGVscGVyLmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgaW5k
ZXggYjYyYjAzNjM1MDUwLi4zMzgwN2UwYWRhYzcKPiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw
dS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFu
ZV9oZWxwZXIuYwo+IEBAIC0zNTMsMTMgKzM1MywxNCBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFu
ZSAqY3JlYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0Cj4gZHJtX2RldmljZSAqZGV2KSBpZiAocHJp
bWFyeSA9PSBOVUxMKSB7Cj4gIAkJRFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIGFsbG9jYXRlIHBy
aW1hcnkgcGxhbmVcbiIpOwo+ICAJCXJldHVybiBOVUxMOwo+IC0JCS8qCj4gLQkJICogUmVtb3Zl
IHRoZSBmb3JtYXRfZGVmYXVsdCBmaWVsZCBmcm9tIGRybV9wbGFuZSB3aGVuIGRyb3BwaW5nCj4g
LQkJICogdGhpcyBoZWxwZXIuCj4gLQkJICovCj4gLQkJcHJpbWFyeS0+Zm9ybWF0X2RlZmF1bHQg
PSB0cnVlOwo+ICAJfQo+IAo+ICsJLyoKPiArCSAqIFJlbW92ZSB0aGUgZm9ybWF0X2RlZmF1bHQg
ZmllbGQgZnJvbSBkcm1fcGxhbmUgd2hlbiBkcm9wcGluZwo+ICsJICogdGhpcyBoZWxwZXIuCj4g
KwkgKi8KPiArCXByaW1hcnktPmZvcm1hdF9kZWZhdWx0ID0gdHJ1ZTsKPiArCj4gIAkvKiBwb3Nz
aWJsZV9jcnRjJ3Mgd2lsbCBiZSBmaWxsZWQgaW4gbGF0ZXIgYnkgY3J0Y19pbml0ICovCj4gIAly
ZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoZGV2LCBwcmltYXJ5LCAwLAo+ICAJCQkJICAg
ICAgICZkcm1fcHJpbWFyeV9oZWxwZXJfZnVuY3MsCgotLSAKUmVnYXJkcywKCkxhdXJlbnQgUGlu
Y2hhcnQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy
aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==