From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@linux.intel.com>
Subject: Re: 2 questions about git and merging
Date: Wed, 27 May 2015 09:24:31 +0300
Message-ID: <87mw0q4jxc.fsf@intel.com>
References: <55647070.70909@ts.fujitsu.com>
 <20150526140427.GO12971@phenom.ffwll.local> <87vbffgygg.fsf@intel.com>
 <CAPM=9tzjYGkDCyNxDHc=QzgU1Dxcb_2Soih6FR0FNJ5wjdsAjA@mail.gmail.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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 9E9156E3AF
 for <dri-devel@lists.freedesktop.org>; Tue, 26 May 2015 23:26:13 -0700 (PDT)
In-Reply-To: <CAPM=9tzjYGkDCyNxDHc=QzgU1Dxcb_2Soih6FR0FNJ5wjdsAjA@mail.gmail.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: Dave Airlie <airlied@gmail.com>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

T24gV2VkLCAyNyBNYXkgMjAxNSwgRGF2ZSBBaXJsaWUgPGFpcmxpZWRAZ21haWwuY29tPiB3cm90
ZToKPiBPbiAyNyBNYXkgMjAxNSBhdCAwMToxNywgSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxp
bnV4LmludGVsLmNvbT4gd3JvdGU6Cj4+IE9uIFR1ZSwgMjYgTWF5IDIwMTUsIERhbmllbCBWZXR0
ZXIgPGRhbmllbEBmZndsbC5jaD4gd3JvdGU6Cj4+PiBPbiBUdWUsIE1heSAyNiwgMjAxNSBhdCAw
MzowOTowNFBNICswMjAwLCBSYWluZXIgS29lbmlnIHdyb3RlOgo+Pj4+IEhpLAo+Pj4+Cj4+Pj4g
YSB3ZWVrIGFnbyBJIGV4cGVyaWVuY2VkIHByb2JsZW1zIG9uIHRoZSBza3lsYWtlIHBsYXRmb3Jt
IGFuZCBnb3QgdGhlCj4+Pj4gYWRpdmNlIHRvIHRyeSBvdXQgdGhlIGRybS1pbnRlbC1uaWdodGx5
IGJyYW5jaC4gSSB0cmllZCBhbmQgaXQgd2FzIGEKPj4+PiBzdWNjZXNzLgo+Pj4+Cj4+Pj4gU28g
YWZ0ZXIgdGhlIGluaXRpYWwgImdpdCBjbG9uZSIgb2YgdGhlIHRyZWUgSSB0cmllZCB0byBrZWVw
IHVwZGF0ZWQgYnkKPj4+PiBkb2luZyBhICJnaXQgcHVsbCIgZnJvbSB0aW1lIHRvIHRpbWUsIGJ1
dCB3aGF0J3MgcmVhbGx5IHN0cmFuZ2UgaXMgdGhhdAo+Pj4+IEkgZ290IG1lcmdlIGNvbmZsaWN0
cywgdXN1YWxseSBpbiB0aGUgZmlsZSBpbnRlZ3JhdGlvbi1tYW5pZmVzdCwgYnV0Cj4+Pj4gc29t
ZXRpbWVzIGFsc28gaW4gc291cmNlIGZpbGVzLgo+Pj4+Cj4+Pj4gVGhhdCdzIGxvb2tzIHNvbWV3
aGF0IHdlaXJkIGJlY2F1c2UgSSBkaWRuJ3QgdG91Y2ggYW55IG9mIHRoZSBmaWxlcyBpbgo+Pj4+
IHRoZSB0cmVlIGFuZCBJIHRob3VnaHQgdGhhdCBhZnRlciBjbG9uaW5nIGEgZnJlcXVlbnQgImdp
dCBwdWxsIiB3aWxsCj4+Pj4ga2VlcCBtZSB1cCB0byBkYXRlIHdpdGhvdXQgdGhlIG5lZWQgdG8g
cmVzb2x2ZSBtZXJnZSBjb25mbGljdHMuCj4+Pj4KPj4+PiBXaGF0IGlzIHdyb25nIHdpdGggbXkg
dGhvdWdodD8gV2hhdCBkaWQgSSBkbyB3cm9uZz8KPj4+Cj4+PiAtbmlndGhseSBpcyBhIHJlYmFz
aW5nIHRyZWUsIGdpdCBwdWxsIGRvZXMgdGhlIHdyb25nIHRoaW5nIGZvciB0aGF0LiBUaGUKPj4+
IHByb3BlciB3YXkgdG8gdHJhY2sgcmViYXNpbmcgYnJhbmNoZXMgaXMgKGFzc3VtaW5nIHlvdSBo
YXZlIG5vIGxvY2FsCj4+PiBwYXRjaGVzIHRoYXQgeW91IHdhbnQgdG8ga2VlcCk6Cj4+Pgo+Pj4g
JCBnaXQgZmV0Y2ggb3JpZ2luCj4+PiAkIGdpdCByZXNldCAtLWhhcmQgQHt1cHN0cmVhbX0KPj4+
Cj4+Pj4gU2Vjb25kLCBJIHB1bGxlZCB0aGUgIkxpbnVzIi10cmVlIHRvZGF5IGFuZCBmb3VuZCBz
b21lIGxvZyBlbnRyaWVzIHRoYXQKPj4+PiBzYWlkCj4+Pj4gIE1lcmdlIGJyYW5jaCAnZHJtLWZp
eGVzLTQuMScgb2YKPj4+PiBnaXQ6Ly9wZW9wbGUuZnJlZWRlc2t0b3Aub3JnL35hZ2Q1Zi9saW51
eCBpbnRvIGRybS1maXhlcwo+Pj4+Cj4+Pj4gYW5kCj4+Pj4gIE1lcmdlIHRhZyAnZHJtLWludGVs
LWZpeGVzLTIwMTUtMDUtMjEnIG9mCj4+Pj4gZ2l0Oi8vYW5vbmdpdC5mcmVlZGVza3RvcC5vcmcv
ZHJtLWludGVsIGludG8gZHJtLWZpeGVzCj4+Pj4KPj4+PiBTbyBJIGFzc3VtZWQsIHRoYXQgdGhl
IGZpeCBJIHByb3ZlZCB0byB3b3JrIG9uZSB3ZWVrIGFnbyBub3cgc2hvdWxkIGFsc28KPj4+PiBi
ZSBhdmFpbGFibGUgaW4gdGhlICJ2YW5pbGxhIiB0cmVlLiBTbyBJIGNvbXBpbGVkIHRoYXQgb24g
bXkgdGVzdAo+Pj4+IG1hY2hpbmUgYW5kIGdvdCBteSBidWcgYmFjay4gOi0oCj4+Pj4KPj4+PiBT
byBteSBvdGhlciBxdWVzdGlvbiBpcywgaG93IGRvIGZpeGVzIGZyb20gZHJtLWludGVsLW5pZ2h0
bHkgZmluZCB0aGVpcgo+Pj4+IHdlYXkgaW50byB0aGUgInZhbmlsbGEiIGxpbnV4IHRyZWU/IElz
IHRoZXJlIHNvbWUgc29ydCBvZiBwcm9jZXNzCj4+Pj4gZGVzY3JpcHRpb24uCj4+Pgo+Pj4gSXQg
dGFrZXMgYSB3aGlsZS4gSWYgdGhlIHBhdGNoIGlzIGluIGRybS1pbnRlbC1maXhlcywgaXQgd2ls
bCBmaXJzdCBnb3QgdG8KPj4+IGRybS1maXhlcyBhbmQgdGhlbiB0byB2YW5pbGxhIHVwc3RyZWFt
LCB0aGVuIHRvIHN0YWJsZSBrZXJuZWxzIChpZiBpdCdzCj4+PiBjYzogc3RhYmxlKS4gWW91IGNh
biBjaGVjayB3aGljaCBicmFuY2ggYSBwYXRjaCBpcyBpbiBhbHJlYWR5IHdpdGgKPj4KPj4gSG93
ZXZlciB3ZSBkb24ndCBuZWNlc3NhcmlseSBxdWV1ZSBTa3lsYWtlIGZpeGVzIHRvIHRoZSBjdXJy
ZW50Cj4+IGRldmVsb3BtZW50IGtlcm5lbHMgdGhyb3VnaCBkcm0taW50ZWwtZml4ZXMvZHJtLWZp
eGVzLCBhcyB0aGUgU2t5bGFrZQo+PiBzdXBwb3J0IHRoZXJlIGlzIGFueXdheSBwcmVsaW1pbmFy
eSwgdGhlIGZpeCAoSSBkb24ndCB0aGluayB3ZSBmaWd1cmVkCj4+IG91dCB3aGljaCBleGFjdCBj
b21taXQgaXQgd2FzLCBkaWQgd2U/KSBtYXkgb25seSBlbmQgdXAgdXBzdHJlYW0gYWZ0ZXIKPj4g
dGhlIG5leHQgbWVyZ2Ugd2luZG93LCBpLmUuIGF0IHY0LjItcmMxLgo+Cj4gU28gNC4xIHdvbid0
IGN1dCBpdCBvbiBza3lsYWtlPyBJJ20gbm90IHN1cmUgZXZlcnlvbmUgaW4gSW50ZWwgaXMgYXdh
cmUuCgpNeSBhcHByb2FjaCBoYXMgYmVlbiB0aGF0IEkgZG9uJ3QgcXVldWUgZml4ZXMgdG8gY3Vy
cmVudCBkZXZlbG9wbWVudAprZXJuZWxzIGZvciBwbGF0Zm9ybXMgdGhhdCBzdGlsbCByZXF1aXJl
IGk5MTUucHJlbGltaW5hcnlfaHdfc3VwcG9ydD0xCm9yIENPTkZJR19EUk1fSTkxNV9QUkVMSU1J
TkFSWV9IV19TVVBQT1JUPXkuIE9idmlvdXNseSBzYW1lIGZvcgpzdGFibGUuIEkgZG9uJ3QgdGhp
bmsgdGhpcyBpcyB1bnJlYXNvbmFibGUuCgpCYXNpY2FsbHkgcHJlbGltaW5hcnkgbWVhbnMgdGhl
IGltcGxlbWVudGF0aW9uIGRvZXMgbm90IGhhdmUgZmVhdHVyZQpwYXJpdHkgd2l0aCB0aGUgcHJl
Y2VkaW5nIHBsYXRmb3JtLCBhbmQgaXMgZXhwZWN0ZWQgdG8gYmUgcm91Z2ggYXJvdW5kCnRoIGVk
Z2VzLgoKU2t5bGFrZSBzdGlsbCByZXF1aXJlcyB0aGUgcHJlbGltaW5hcnkgZmxhZyBldmVuIGlu
CmRybS1pbnRlbC1uaWdodGx5LiBEYW1pZW4sIHNob3VsZCB3ZSBkcm9wIHByZWxpbWluYXJ5IGZv
ciBTa3lsYWtlIGluCnY0LjI/IE9yIGFscmVhZHkgaW4gdjQuMT8KCkJSLApKYW5pLgoKCi0tIApK
YW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg
bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz
a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK