From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <igt-dev-bounces@lists.freedesktop.org>
Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com
 [IPv6:2a00:1450:4864:20::541])
 by gabe.freedesktop.org (Postfix) with ESMTPS id AACA289BB3
 for <igt-dev@lists.freedesktop.org>; Wed, 12 Dec 2018 14:08:36 +0000 (UTC)
Received: by mail-ed1-x541.google.com with SMTP id d3so15649183edx.7
 for <igt-dev@lists.freedesktop.org>; Wed, 12 Dec 2018 06:08:36 -0800 (PST)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 12 Dec 2018 15:08:28 +0100
Message-Id: <20181212140828.8433-1-daniel.vetter@ffwll.ch>
MIME-Version: 1.0
Subject: [igt-dev] [PATCH] drm-tip: Docs for handling silent conflicts
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/igt-dev>,
 <mailto:igt-dev-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/igt-dev>
List-Post: <mailto:igt-dev@lists.freedesktop.org>
List-Help: <mailto:igt-dev-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/igt-dev>,
 <mailto:igt-dev-request@lists.freedesktop.org?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: igt-dev-bounces@lists.freedesktop.org
Sender: "igt-dev" <igt-dev-bounces@lists.freedesktop.org>
To: IGT development <igt-dev@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>, Rob Clark <robdclark@gmail.com>, Boris Brezillon <boris.brezillon@bootlin.com>
List-ID: <igt-dev@lists.freedesktop.org>

Qm9yaXMgbmVlZHMgdGhpcy4KCnYyOiBJbXByb3ZlIHRoZSB0ZXh0IGZvciBhbGwgY2FzZXMgdGhh
dCBuZWVkIG1hbnVhbCBmaXh1cHMuCgpDYzogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29t
PgpDYzogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AYm9vdGxpbi5jb20+ClNpZ25l
ZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgotLS0KIGRy
bS10aXAucnN0IHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBj
aGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJtLXRpcC5yc3QgYi9kcm0t
dGlwLnJzdAppbmRleCAwMDIyNDZmNTczZTMuLmUzOGY1OWRmMWUzZiAxMDA2NDQKLS0tIGEvZHJt
LXRpcC5yc3QKKysrIGIvZHJtLXRpcC5yc3QKQEAgLTEzMiwzICsxMzIsMzUgQEAgYmVzdCB3YXkg
dG8gZ28gYWJvdXQgdGhpcyBpczoKICAgIHNtb290aGx5LCBhdCBsZWFzdCBmb3IgdGhpcyBtZXJn
ZTo6CiAKICAgICAgICAkIGRpbSByZWJ1aWxkLXRpcAorCitGaXhpbmcgU2lsZW50IENvbmZsaWN0
cworLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworQSByZWFsbHkgYW5ub3lpbmcgY2FzZSBpcyB3
aGVuIGEgbWVyZ2UgaGFzIGEgc2lsZW50IGNvbmZsaWN0LCBpLmUuIGdpdCBtZXJnZQorc3VjY2Vl
ZHMsIGJ1dCB0aGUgcmVzdWx0aW5nIHNvdXJjZSBmYWlscyB0byBjb21waWxlIG9yIHJ1bi4gT2Z0
ZW4gdGhpcyBoYXBwZW5zCit3aGVuIG9uZSBicmFuY2ggY2hhbmdlcyBhIGZ1bmN0aW9uIG9yIHN0
cnVjdHVyZSwgd2hpbGUgYSAybmQgYnJhbmNoIGFkZHMgYSBuZXcKK3VzZXIuIFRoZSBpbXBvcnRh
bnQgcGFydCBpcyB0byBtYWtlIHN1cmUgd2Ugc3VwcGx5IHRoZSBmaXh1cCBwYXRjaCBmb3IgdGhl
IHJpZ2h0CittZXJnZSBjb21taXQuCisKKzEuIElkZW50aWZ5IHRoZSBtZXJnZSB0aGF0IGJyZWFr
cyB0aGUgYnVpbGQuCisKKzIuIFJlYnVpbGQgZHJtLXRpcCBpbiBpbnRlcmFjdGl2ZSBtb2RlLCBh
bmQgc3RvcCB1bnRpbCB0aGUgYnJva2VuIG1lcmdlIGhhcyBiZWVuCisgICBkb25lOjoKKworICAg
ICAgJCBkaW0gLWkgcmVidWlsZC10aXAKKworICAgU3RvcCB0aGUgcmVidWlsZGluZyBvZiBkcm0t
dGlwIGJ5IGhpdHRpbmcgXkMuCisKKzMuIFJlc29sdmUgdGhlIGNvbmZsaWN0IG5vcm1hbGx5LCBi
dXQgZG9uJ3Qgc3RhZ2UgaXQgb3IgY29tbWl0IGl0IGluIGFueQorICAgZmFzaGlvbi4gQ2hlY2sg
dGhhdCB0aGUgcmVzb2x1dGlvbiBsb29rcyBjb3JyZWN0OjoKKworICAgICAgICQgZ2l0IGRpZmYK
KworICAgT2YgY291cnNlIGFsc28gbWFrZSBzdXJlIGl0IGFjdHVhbGx5IGJ1aWxkcy93b3Jrcy4g
VGhlbiBzdG9yZSBpdCBhcyBhIG1hbnVhbCBmaXh1cCBwYXRjaDo6CisKKyAgICAgICAkIGdpdCBk
aWZmIHwgZGltIGNhdC10by1maXh1cAorCis0LiBGaW5hbGx5IHJlYnVpbGQgdGhlIGludGVncmF0
aW9uIHRyZWUsIHdoaWNoIHNob3VsZCBub3cgcmVzdWx0IGluIGEgd29ya2luZworICAgdHJlZSB3
aXRoIG5vIGJyb2tlbiBtZXJnZXM6OgorCisgICAgICAgJCBkaW0gcmVidWlsZC10aXAKLS0gCjIu
MjAuMC5yYzEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=