From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: 2 questions about git and merging
Date: Tue, 26 May 2015 16:04:27 +0200
Message-ID: <20150526140427.GO12971@phenom.ffwll.local>
References: <55647070.70909@ts.fujitsu.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 mail-wi0-f172.google.com (mail-wi0-f172.google.com
 [209.85.212.172])
 by gabe.freedesktop.org (Postfix) with ESMTP id B0FE96E080
 for <dri-devel@lists.freedesktop.org>; Tue, 26 May 2015 07:02:00 -0700 (PDT)
Received: by wifw1 with SMTP id w1so32151113wif.0
 for <dri-devel@lists.freedesktop.org>; Tue, 26 May 2015 07:02:00 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <55647070.70909@ts.fujitsu.com>
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: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
Cc: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

T24gVHVlLCBNYXkgMjYsIDIwMTUgYXQgMDM6MDk6MDRQTSArMDIwMCwgUmFpbmVyIEtvZW5pZyB3
cm90ZToKPiBIaSwKPiAKPiBhIHdlZWsgYWdvIEkgZXhwZXJpZW5jZWQgcHJvYmxlbXMgb24gdGhl
IHNreWxha2UgcGxhdGZvcm0gYW5kIGdvdCB0aGUKPiBhZGl2Y2UgdG8gdHJ5IG91dCB0aGUgZHJt
LWludGVsLW5pZ2h0bHkgYnJhbmNoLiBJIHRyaWVkIGFuZCBpdCB3YXMgYQo+IHN1Y2Nlc3MuCj4g
Cj4gU28gYWZ0ZXIgdGhlIGluaXRpYWwgImdpdCBjbG9uZSIgb2YgdGhlIHRyZWUgSSB0cmllZCB0
byBrZWVwIHVwZGF0ZWQgYnkKPiBkb2luZyBhICJnaXQgcHVsbCIgZnJvbSB0aW1lIHRvIHRpbWUs
IGJ1dCB3aGF0J3MgcmVhbGx5IHN0cmFuZ2UgaXMgdGhhdAo+IEkgZ290IG1lcmdlIGNvbmZsaWN0
cywgdXN1YWxseSBpbiB0aGUgZmlsZSBpbnRlZ3JhdGlvbi1tYW5pZmVzdCwgYnV0Cj4gc29tZXRp
bWVzIGFsc28gaW4gc291cmNlIGZpbGVzLgo+IAo+IFRoYXQncyBsb29rcyBzb21ld2hhdCB3ZWly
ZCBiZWNhdXNlIEkgZGlkbid0IHRvdWNoIGFueSBvZiB0aGUgZmlsZXMgaW4KPiB0aGUgdHJlZSBh
bmQgSSB0aG91Z2h0IHRoYXQgYWZ0ZXIgY2xvbmluZyBhIGZyZXF1ZW50ICJnaXQgcHVsbCIgd2ls
bAo+IGtlZXAgbWUgdXAgdG8gZGF0ZSB3aXRob3V0IHRoZSBuZWVkIHRvIHJlc29sdmUgbWVyZ2Ug
Y29uZmxpY3RzLgo+IAo+IFdoYXQgaXMgd3Jvbmcgd2l0aCBteSB0aG91Z2h0PyBXaGF0IGRpZCBJ
IGRvIHdyb25nPwoKLW5pZ3RobHkgaXMgYSByZWJhc2luZyB0cmVlLCBnaXQgcHVsbCBkb2VzIHRo
ZSB3cm9uZyB0aGluZyBmb3IgdGhhdC4gVGhlCnByb3BlciB3YXkgdG8gdHJhY2sgcmViYXNpbmcg
YnJhbmNoZXMgaXMgKGFzc3VtaW5nIHlvdSBoYXZlIG5vIGxvY2FsCnBhdGNoZXMgdGhhdCB5b3Ug
d2FudCB0byBrZWVwKToKCiQgZ2l0IGZldGNoIG9yaWdpbgokIGdpdCByZXNldCAtLWhhcmQgQHt1
cHN0cmVhbX0KCj4gU2Vjb25kLCBJIHB1bGxlZCB0aGUgIkxpbnVzIi10cmVlIHRvZGF5IGFuZCBm
b3VuZCBzb21lIGxvZyBlbnRyaWVzIHRoYXQKPiBzYWlkCj4gIE1lcmdlIGJyYW5jaCAnZHJtLWZp
eGVzLTQuMScgb2YKPiBnaXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35hZ2Q1Zi9saW51eCBp
bnRvIGRybS1maXhlcwo+IAo+IGFuZAo+ICBNZXJnZSB0YWcgJ2RybS1pbnRlbC1maXhlcy0yMDE1
LTA1LTIxJyBvZgo+IGdpdDovL2Fub25naXQuZnJlZWRlc2t0b3Aub3JnL2RybS1pbnRlbCBpbnRv
IGRybS1maXhlcwo+IAo+IFNvIEkgYXNzdW1lZCwgdGhhdCB0aGUgZml4IEkgcHJvdmVkIHRvIHdv
cmsgb25lIHdlZWsgYWdvIG5vdyBzaG91bGQgYWxzbwo+IGJlIGF2YWlsYWJsZSBpbiB0aGUgInZh
bmlsbGEiIHRyZWUuIFNvIEkgY29tcGlsZWQgdGhhdCBvbiBteSB0ZXN0Cj4gbWFjaGluZSBhbmQg
Z290IG15IGJ1ZyBiYWNrLiA6LSgKPiAKPiBTbyBteSBvdGhlciBxdWVzdGlvbiBpcywgaG93IGRv
IGZpeGVzIGZyb20gZHJtLWludGVsLW5pZ2h0bHkgZmluZCB0aGVpcgo+IHdlYXkgaW50byB0aGUg
InZhbmlsbGEiIGxpbnV4IHRyZWU/IElzIHRoZXJlIHNvbWUgc29ydCBvZiBwcm9jZXNzCj4gZGVz
Y3JpcHRpb24uCgpJdCB0YWtlcyBhIHdoaWxlLiBJZiB0aGUgcGF0Y2ggaXMgaW4gZHJtLWludGVs
LWZpeGVzLCBpdCB3aWxsIGZpcnN0IGdvdCB0bwpkcm0tZml4ZXMgYW5kIHRoZW4gdG8gdmFuaWxs
YSB1cHN0cmVhbSwgdGhlbiB0byBzdGFibGUga2VybmVscyAoaWYgaXQncwpjYzogc3RhYmxlKS4g
WW91IGNhbiBjaGVjayB3aGljaCBicmFuY2ggYSBwYXRjaCBpcyBpbiBhbHJlYWR5IHdpdGgKCiQg
Z2l0IGJyYW5jaCAtLWNvbnRhaW5zICRzaGExCgpBZGQgLXIgaWYgeW91IHdhbnQgdG8gc2VlIGFs
bCB0aGUgcmVtb3RlIGJyYW5jaGVzIHRvby4KCkNoZWVycywgRGFuaWVsCgo+IAo+IFRoYW5rcyBm
b3IgYW55IGV4cGxhbmF0aW9uCj4gUmFpbmVyCj4gLS0gCj4gRGlwbC4tSW5mLiAoRkgpIFJhaW5l
ciBLb2VuaWcKPiBQcm9qZWN0IE1hbmFnZXIgTGludXggQ2xpZW50cwo+IERlcHQuIFBERyBXUFMg
UiZEIFNXIE9TRQo+IAo+IEZ1aml0c3UgVGVjaG5vbG9neSBTb2x1dGlvbnMKPiBCw7xyZ2VybWVp
c3Rlci1VbGxyaWNoLVN0ci4gMTAwCj4gODYxOTkgQXVnc2J1cmcKPiBHZXJtYW55Cj4gCj4gVGVs
ZXBob25lOiArNDktODIxLTgwNC0zMzIxCj4gVGVsZWZheDogICArNDktODIxLTgwNC0yMTMxCj4g
TWFpbDogICAgICBtYWlsdG86UmFpbmVyLktvZW5pZ0B0cy5mdWppdHN1LmNvbQo+IAo+IEludGVy
bmV0ICAgICAgICAgdHMuZnVqdHN1LmNvbQo+IENvbXBhbnkgRGV0YWlscyAgdHMuZnVqaXRzdS5j
b20vaW1wcmludC5odG1sCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVk
ZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9kcmktZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBD
b3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs
aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2RyaS1kZXZlbAo=