From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: 2 questions about git and merging Date: Tue, 26 May 2015 18:17:35 +0300 Message-ID: <87vbffgygg.fsf@intel.com> References: <55647070.70909@ts.fujitsu.com> <20150526140427.GO12971@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 750296E6E9 for ; Tue, 26 May 2015 08:19:46 -0700 (PDT) In-Reply-To: <20150526140427.GO12971@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Rainer Koenig Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAyNiBNYXkgMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBUdWUsIE1heSAyNiwgMjAxNSBhdCAwMzowOTowNFBNICswMjAwLCBSYWluZXIgS29l bmlnIHdyb3RlOgo+PiBIaSwKPj4gCj4+IGEgd2VlayBhZ28gSSBleHBlcmllbmNlZCBwcm9ibGVt cyBvbiB0aGUgc2t5bGFrZSBwbGF0Zm9ybSBhbmQgZ290IHRoZQo+PiBhZGl2Y2UgdG8gdHJ5IG91 dCB0aGUgZHJtLWludGVsLW5pZ2h0bHkgYnJhbmNoLiBJIHRyaWVkIGFuZCBpdCB3YXMgYQo+PiBz dWNjZXNzLgo+PiAKPj4gU28gYWZ0ZXIgdGhlIGluaXRpYWwgImdpdCBjbG9uZSIgb2YgdGhlIHRy ZWUgSSB0cmllZCB0byBrZWVwIHVwZGF0ZWQgYnkKPj4gZG9pbmcgYSAiZ2l0IHB1bGwiIGZyb20g dGltZSB0byB0aW1lLCBidXQgd2hhdCdzIHJlYWxseSBzdHJhbmdlIGlzIHRoYXQKPj4gSSBnb3Qg bWVyZ2UgY29uZmxpY3RzLCB1c3VhbGx5IGluIHRoZSBmaWxlIGludGVncmF0aW9uLW1hbmlmZXN0 LCBidXQKPj4gc29tZXRpbWVzIGFsc28gaW4gc291cmNlIGZpbGVzLgo+PiAKPj4gVGhhdCdzIGxv b2tzIHNvbWV3aGF0IHdlaXJkIGJlY2F1c2UgSSBkaWRuJ3QgdG91Y2ggYW55IG9mIHRoZSBmaWxl cyBpbgo+PiB0aGUgdHJlZSBhbmQgSSB0aG91Z2h0IHRoYXQgYWZ0ZXIgY2xvbmluZyBhIGZyZXF1 ZW50ICJnaXQgcHVsbCIgd2lsbAo+PiBrZWVwIG1lIHVwIHRvIGRhdGUgd2l0aG91dCB0aGUgbmVl ZCB0byByZXNvbHZlIG1lcmdlIGNvbmZsaWN0cy4KPj4gCj4+IFdoYXQgaXMgd3Jvbmcgd2l0aCBt eSB0aG91Z2h0PyBXaGF0IGRpZCBJIGRvIHdyb25nPwo+Cj4gLW5pZ3RobHkgaXMgYSByZWJhc2lu ZyB0cmVlLCBnaXQgcHVsbCBkb2VzIHRoZSB3cm9uZyB0aGluZyBmb3IgdGhhdC4gVGhlCj4gcHJv cGVyIHdheSB0byB0cmFjayByZWJhc2luZyBicmFuY2hlcyBpcyAoYXNzdW1pbmcgeW91IGhhdmUg bm8gbG9jYWwKPiBwYXRjaGVzIHRoYXQgeW91IHdhbnQgdG8ga2VlcCk6Cj4KPiAkIGdpdCBmZXRj aCBvcmlnaW4KPiAkIGdpdCByZXNldCAtLWhhcmQgQHt1cHN0cmVhbX0KPgo+PiBTZWNvbmQsIEkg cHVsbGVkIHRoZSAiTGludXMiLXRyZWUgdG9kYXkgYW5kIGZvdW5kIHNvbWUgbG9nIGVudHJpZXMg dGhhdAo+PiBzYWlkCj4+ICBNZXJnZSBicmFuY2ggJ2RybS1maXhlcy00LjEnIG9mCj4+IGdpdDov L3Blb3BsZS5mcmVlZGVza3RvcC5vcmcvfmFnZDVmL2xpbnV4IGludG8gZHJtLWZpeGVzCj4+IAo+ PiBhbmQKPj4gIE1lcmdlIHRhZyAnZHJtLWludGVsLWZpeGVzLTIwMTUtMDUtMjEnIG9mCj4+IGdp dDovL2Fub25naXQuZnJlZWRlc2t0b3Aub3JnL2RybS1pbnRlbCBpbnRvIGRybS1maXhlcwo+PiAK Pj4gU28gSSBhc3N1bWVkLCB0aGF0IHRoZSBmaXggSSBwcm92ZWQgdG8gd29yayBvbmUgd2VlayBh Z28gbm93IHNob3VsZCBhbHNvCj4+IGJlIGF2YWlsYWJsZSBpbiB0aGUgInZhbmlsbGEiIHRyZWUu IFNvIEkgY29tcGlsZWQgdGhhdCBvbiBteSB0ZXN0Cj4+IG1hY2hpbmUgYW5kIGdvdCBteSBidWcg YmFjay4gOi0oCj4+IAo+PiBTbyBteSBvdGhlciBxdWVzdGlvbiBpcywgaG93IGRvIGZpeGVzIGZy b20gZHJtLWludGVsLW5pZ2h0bHkgZmluZCB0aGVpcgo+PiB3ZWF5IGludG8gdGhlICJ2YW5pbGxh IiBsaW51eCB0cmVlPyBJcyB0aGVyZSBzb21lIHNvcnQgb2YgcHJvY2Vzcwo+PiBkZXNjcmlwdGlv bi4KPgo+IEl0IHRha2VzIGEgd2hpbGUuIElmIHRoZSBwYXRjaCBpcyBpbiBkcm0taW50ZWwtZml4 ZXMsIGl0IHdpbGwgZmlyc3QgZ290IHRvCj4gZHJtLWZpeGVzIGFuZCB0aGVuIHRvIHZhbmlsbGEg dXBzdHJlYW0sIHRoZW4gdG8gc3RhYmxlIGtlcm5lbHMgKGlmIGl0J3MKPiBjYzogc3RhYmxlKS4g WW91IGNhbiBjaGVjayB3aGljaCBicmFuY2ggYSBwYXRjaCBpcyBpbiBhbHJlYWR5IHdpdGgKCkhv d2V2ZXIgd2UgZG9uJ3QgbmVjZXNzYXJpbHkgcXVldWUgU2t5bGFrZSBmaXhlcyB0byB0aGUgY3Vy cmVudApkZXZlbG9wbWVudCBrZXJuZWxzIHRocm91Z2ggZHJtLWludGVsLWZpeGVzL2RybS1maXhl cywgYXMgdGhlIFNreWxha2UKc3VwcG9ydCB0aGVyZSBpcyBhbnl3YXkgcHJlbGltaW5hcnksIHRo ZSBmaXggKEkgZG9uJ3QgdGhpbmsgd2UgZmlndXJlZApvdXQgd2hpY2ggZXhhY3QgY29tbWl0IGl0 IHdhcywgZGlkIHdlPykgbWF5IG9ubHkgZW5kIHVwIHVwc3RyZWFtIGFmdGVyCnRoZSBuZXh0IG1l cmdlIHdpbmRvdywgaS5lLiBhdCB2NC4yLXJjMS4KCkJSLApKYW5pLgoKCj4KPiAkIGdpdCBicmFu Y2ggLS1jb250YWlucyAkc2hhMQo+Cj4gQWRkIC1yIGlmIHlvdSB3YW50IHRvIHNlZSBhbGwgdGhl IHJlbW90ZSBicmFuY2hlcyB0b28uCj4KPiBDaGVlcnMsIERhbmllbAo+Cj4+IAo+PiBUaGFua3Mg Zm9yIGFueSBleHBsYW5hdGlvbgo+PiBSYWluZXIKPj4gLS0gCj4+IERpcGwuLUluZi4gKEZIKSBS YWluZXIgS29lbmlnCj4+IFByb2plY3QgTWFuYWdlciBMaW51eCBDbGllbnRzCj4+IERlcHQuIFBE RyBXUFMgUiZEIFNXIE9TRQo+PiAKPj4gRnVqaXRzdSBUZWNobm9sb2d5IFNvbHV0aW9ucwo+PiBC w7xyZ2VybWVpc3Rlci1VbGxyaWNoLVN0ci4gMTAwCj4+IDg2MTk5IEF1Z3NidXJnCj4+IEdlcm1h bnkKPj4gCj4+IFRlbGVwaG9uZTogKzQ5LTgyMS04MDQtMzMyMQo+PiBUZWxlZmF4OiAgICs0OS04 MjEtODA0LTIxMzEKPj4gTWFpbDogICAgICBtYWlsdG86UmFpbmVyLktvZW5pZ0B0cy5mdWppdHN1 LmNvbQo+PiAKPj4gSW50ZXJuZXQgICAgICAgICB0cy5mdWp0c3UuY29tCj4+IENvbXBhbnkgRGV0 YWlscyAgdHMuZnVqaXRzdS5jb20vaW1wcmludC5odG1sCj4+IF9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCj4+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPj4g ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+PiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCj4KPiAtLSAKPiBEYW5pZWwgVmV0dGVy Cj4gU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCj4gaHR0cDovL2Jsb2cuZmZ3 bGwuY2gKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+ IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=