From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: Re: [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict
 resolution
Date: Fri, 12 Apr 2019 11:46:33 +0300
Message-ID: <87wojzhaqe.fsf@intel.com>
References: <2173849.8TjdhqGAES@jkrzyszt-desk.ger.corp.intel.com>
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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTPS id D2D2889786
 for <dri-devel@lists.freedesktop.org>; Fri, 12 Apr 2019 08:46:25 +0000 (UTC)
In-Reply-To: <2173849.8TjdhqGAES@jkrzyszt-desk.ger.corp.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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: Dave Airlie <airlied@redhat.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>, dri-devel@lists.freedesktop.org, Lucas De Marchi <lucas.demarchi@intel.com>, =?utf-8?Q?Jos=C3=A9?= Roberto de Souza <jose.souza@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Sean Paul <seanpaul@chromium.org>, Gerd Hoffmann <kraxel@redhat.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>, Thierry Reding <treding@nvidia.com>, Daniel Stone <daniels@collabora.com>
List-Id: dri-devel@lists.freedesktop.org

T24gRnJpLCAxMiBBcHIgMjAxOSwgSmFudXN6IEtyenlzenRvZmlrIDxqYW51c3oua3J6eXN6dG9m
aWtAbGludXguaW50ZWwuY29tPiB3cm90ZToKPiBBIGNoYW5nZSBpbnRyb2R1Y2VkIGJ5IGNvbW1p
dCBiYTNiZjM3ZTE1MGEgKCJkcm0vZHJ2OiBkcm1fZGV2X3VucGx1ZygpOgo+IE1vdmUgb3V0IGRy
bV9kZXZfcHV0KCkgY2FsbCIpIHRvIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMgaGFzIGJlZW4K
PiByZXZlcnRlZCBieSB0aGF0IGluY29ycmVjdCBtZXJnZSBjb25mbGljdCByZXNvbHV0aW9uLCBm
aXggaXQuCj4KPiBUaGF0IGhhcyBiZWVuIGFwcGFyZW50bHkgaW50cm9kdWNlZCBpbnRvIHRoZSBy
ZXJlcmUtY2FjaGUgYnJhbmNoIGJ5IGNvbW1pdCAKPiBkYzc4MGYzZjhlYjQgKCIyMDE5eS0wM20t
MjVkLTA2aC01OW0tMTJzIFVUQzogZHJtLXRpcCByZXJlcmUgY2FjaGUgdXBkYXRlIikuCj4KPiBG
aXhlczogZGM3ODBmM2Y4ZWI0ICgiMjAxOXktMDNtLTI1ZC0wNmgtNTltLTEycyBVVEM6IGRybS10
aXAgcmVyZXJlIGNhY2hlIHVwZGF0ZSIpCj4gU2lnbmVkLW9mZi1ieTogSmFudXN6IEtyenlzenRv
ZmlrIDxqYW51c3oua3J6eXN6dG9maWtAbGludXguaW50ZWwuY29tPgoKUGxlYXNlIHRhbGsgdG8g
bWFpbnRhaW5lcnMgb24gI2RyaS1kZXZlbCBvciAjaW50ZWwtZ2Z4IGluc3RlYWQgb2YKc2VuZGlu
ZyBwYXRjaGVzIHRvIHJyLWNhY2hlLgoKQlIsCkphbmkuCgo+IC0tLQo+ICByci1jYWNoZS9hNTg3
ZmExY2JjZGZlNzA1YTRjNjU5NzJmMzNkZmUzNDQ4ZmIzNTUwL3Bvc3RpbWFnZSB8IDEgLQo+ICAx
IGZpbGUgY2hhbmdlZCwgMSBkZWxldGlvbigtKQo+Cj4gZGlmZiAtLWdpdCBhL3JyLWNhY2hlL2E1
ODdmYTFjYmNkZmU3MDVhNGM2NTk3MmYzM2RmZTM0NDhmYjM1NTAvcG9zdGltYWdlIGIvcnItY2Fj
aGUvYTU4N2ZhMWNiY2RmZTcwNWE0YzY1OTcyZjMzZGZlMzQ0OGZiMzU1MC9wb3N0aW1hZ2UKPiBp
bmRleCBlODc3OTllM2U3ZmYuLjUwZDg0OWQxYmM2ZSAxMDA2NDQKPiAtLS0gYS9yci1jYWNoZS9h
NTg3ZmExY2JjZGZlNzA1YTRjNjU5NzJmMzNkZmUzNDQ4ZmIzNTUwL3Bvc3RpbWFnZQo+ICsrKyBi
L3JyLWNhY2hlL2E1ODdmYTFjYmNkZmU3MDVhNGM2NTk3MmYzM2RmZTM0NDhmYjM1NTAvcG9zdGlt
YWdlCj4gQEAgLTUwOCw3ICs1MDgsNiBAQCB2b2lkIGRybV9kZXZfdW5wbHVnKHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYpCj4gIAlzeW5jaHJvbml6ZV9zcmN1KCZkcm1fdW5wbHVnX3NyY3UpOwo+ICAK
PiAgCWRybV9kZXZfdW5yZWdpc3RlcihkZXYpOwo+IC0JZHJtX2Rldl9wdXQoZGV2KTsKPiAgfQo+
ICBFWFBPUlRfU1lNQk9MKGRybV9kZXZfdW5wbHVnKTsKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwg
T3BlbiBTb3VyY2UgR3JhcGhpY3MgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz
LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp
c3RpbmZvL2RyaS1kZXZlbA==