From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
Subject: Re: 2 questions about git and merging
Date: Wed, 27 May 2015 07:03:48 +0200
Message-ID: <55655034.1080006@ts.fujitsu.com>
References: <55647070.70909@ts.fujitsu.com>
 <20150526140427.GO12971@phenom.ffwll.local> <87vbffgygg.fsf@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 dgate20.ts.fujitsu.com (dgate20.ts.fujitsu.com [80.70.172.51])
 by gabe.freedesktop.org (Postfix) with ESMTP id 883236E7B7
 for <dri-devel@lists.freedesktop.org>; Tue, 26 May 2015 22:03:50 -0700 (PDT)
In-Reply-To: <87vbffgygg.fsf@intel.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: Jani Nikula <jani.nikula@linux.intel.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

QW0gMjYuMDUuMjAxNSB1bSAxNzoxNyBzY2hyaWViIEphbmkgTmlrdWxhOgoKPiBIb3dldmVyIHdl
IGRvbid0IG5lY2Vzc2FyaWx5IHF1ZXVlIFNreWxha2UgZml4ZXMgdG8gdGhlIGN1cnJlbnQKPiBk
ZXZlbG9wbWVudCBrZXJuZWxzIHRocm91Z2ggZHJtLWludGVsLWZpeGVzL2RybS1maXhlcywgYXMg
dGhlIFNreWxha2UKPiBzdXBwb3J0IHRoZXJlIGlzIGFueXdheSBwcmVsaW1pbmFyeSwgdGhlIGZp
eCAoSSBkb24ndCB0aGluayB3ZSBmaWd1cmVkCj4gb3V0IHdoaWNoIGV4YWN0IGNvbW1pdCBpdCB3
YXMsIGRpZCB3ZT8pIG1heSBvbmx5IGVuZCB1cCB1cHN0cmVhbSBhZnRlcgo+IHRoZSBuZXh0IG1l
cmdlIHdpbmRvdywgaS5lLiBhdCB2NC4yLXJjMS4KCkkgdW5kZXJzdGFuZCB5b3UgZnJvbSBhIHNv
ZnR3YXJlIGRldmVsb3BlcnMgcG9pbnQgb2Ygdmlldy4gTXkgcmVhbCB3b3JsZApwcm9ibGVtIGlz
IHNpbXBseSBleHBsYWluZWQsIHRoYXQgd2UgZG8gcHJvdG90eXBlIHRlc3RpbmcgZm9yIFNreWxh
a2UKbm93IHdpdGggcmVhbCBwaHlzaWNhbCBoYXJkd2FyZS4gVGhpcyBoYXJkd2FyZSBzaG91bGQg
Z28gaW50byBwcm9kY3V0aW9uCndoZW5ldmVyIEludGVsIGRlY2lkZXMgdG8gcmVsZWFzZSB0aGUg
U2t5bGFrZSBwbGF0Zm9ybSwgcHJvYmFibHkgaW4KUTQvMjAxNS4gRnJvbSB0aGF0IGRhdGUgb24g
cGVvcGxlIGNhbiBidXkgU2t5bGFrZSBiYXNlZCBQQ3MgYW5kCndvcmtzdGF0aW9ucyBhbmQgdGhl
eSBwcm9iYWJseSB3YW50IHRvIHJ1biBMaW51eCBvbiB0aG9zZSBtYWNoaW5lcy4KQnV0IHRoZXkg
ZG9uJ3Qgd2FudCB0byBjb21waWxlIHRoZWlyIG93biBrZXJuZWwsIHRoZXkgd2FudCB0byBzdHVj
ayB3aXRoCndoYXRldmVyIGlzIGluIHRoZSBkaXN0cmlidXRpb25zIChlLmcuIFJIRUwsIFNMRVMs
IFVidW50dSB3aGF0ZXZlcikuIEJ1dAphbHNvIGRpc3RyaWJ1dGlvbnMgaGF2ZSBtZXJnZSB3aW5k
b3dzIGZvciBuZXcgaGFyZHdhcmUgZmVhdHVyZXMgYW5kIHRoZQpsb25nZXIgaXQgdGFrZXMgZm9y
IGEgcGF0Y2ggdG8gc2hvdyB1cCBpbiB0aGUgdmFuaWxsYSB0cmVlIHRoZSBsYXRlciBpdAp3aWxs
IHNob3cgdXAgaW4gdGhlIGluZGl2aWR1YWwgZGlzdHJpYnV0aW9uIGtlcm5lbC4gV29ya2luZyBm
b3IgYQpoYXJkd2FyZSB2ZW5kb3IgSSBzZWUgdGhhdCB0aGlzIGlzIGJhZCBmb3IgYnVzaW5lc3Mu
IDotKQoKVGhhbmtzIGEgbG90IGZvciB0aGUgZXhwbGFuYXRpb25zIGFueXdheSwgbGVhcm5lZCBh
IGxvdCBmcm9tIHRoYXQuCgpCZXN0IHJlZ2FyZHMKUmFpbmVyCi0tIApEaXBsLi1JbmYuIChGSCkg
UmFpbmVyIEtvZW5pZwpQcm9qZWN0IE1hbmFnZXIgTGludXggQ2xpZW50cwpEZXB0LiBQREcgV1BT
IFImRCBTVyBPU0UKCkZ1aml0c3UgVGVjaG5vbG9neSBTb2x1dGlvbnMKQsO8cmdlcm1laXN0ZXIt
VWxscmljaC1TdHIuIDEwMAo4NjE5OSBBdWdzYnVyZwpHZXJtYW55CgpUZWxlcGhvbmU6ICs0OS04
MjEtODA0LTMzMjEKVGVsZWZheDogICArNDktODIxLTgwNC0yMTMxCk1haWw6ICAgICAgbWFpbHRv
OlJhaW5lci5Lb2VuaWdAdHMuZnVqaXRzdS5jb20KCkludGVybmV0ICAgICAgICAgdHMuZnVqdHN1
LmNvbQpDb21wYW55IERldGFpbHMgIHRzLmZ1aml0c3UuY29tL2ltcHJpbnQuaHRtbApfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu
ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk
ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=