From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: 2 questions about git and merging Date: Wed, 27 May 2015 11:28:44 +0200 Message-ID: <20150527092844.GS12971@phenom.ffwll.local> References: <55647070.70909@ts.fujitsu.com> <20150526140427.GO12971@phenom.ffwll.local> <87vbffgygg.fsf@intel.com> <87mw0q4jxc.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A6306E5EB for ; Wed, 27 May 2015 02:26:17 -0700 (PDT) Received: by wizo1 with SMTP id o1so14449660wiz.1 for ; Wed, 27 May 2015 02:26:16 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87mw0q4jxc.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jani Nikula Cc: dri-devel List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXkgMjcsIDIwMTUgYXQgMDk6MjQ6MzFBTSArMDMwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gT24gV2VkLCAyNyBNYXkgMjAxNSwgRGF2ZSBBaXJsaWUgPGFpcmxpZWRAZ21haWwuY29t PiB3cm90ZToKPiA+IE9uIDI3IE1heSAyMDE1IGF0IDAxOjE3LCBKYW5pIE5pa3VsYSA8amFuaS5u aWt1bGFAbGludXguaW50ZWwuY29tPiB3cm90ZToKPiA+PiBPbiBUdWUsIDI2IE1heSAyMDE1LCBE YW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+IHdyb3RlOgo+ID4+PiBPbiBUdWUsIE1heSAy NiwgMjAxNSBhdCAwMzowOTowNFBNICswMjAwLCBSYWluZXIgS29lbmlnIHdyb3RlOgo+ID4+Pj4g SGksCj4gPj4+Pgo+ID4+Pj4gYSB3ZWVrIGFnbyBJIGV4cGVyaWVuY2VkIHByb2JsZW1zIG9uIHRo ZSBza3lsYWtlIHBsYXRmb3JtIGFuZCBnb3QgdGhlCj4gPj4+PiBhZGl2Y2UgdG8gdHJ5IG91dCB0 aGUgZHJtLWludGVsLW5pZ2h0bHkgYnJhbmNoLiBJIHRyaWVkIGFuZCBpdCB3YXMgYQo+ID4+Pj4g c3VjY2Vzcy4KPiA+Pj4+Cj4gPj4+PiBTbyBhZnRlciB0aGUgaW5pdGlhbCAiZ2l0IGNsb25lIiBv ZiB0aGUgdHJlZSBJIHRyaWVkIHRvIGtlZXAgdXBkYXRlZCBieQo+ID4+Pj4gZG9pbmcgYSAiZ2l0 IHB1bGwiIGZyb20gdGltZSB0byB0aW1lLCBidXQgd2hhdCdzIHJlYWxseSBzdHJhbmdlIGlzIHRo YXQKPiA+Pj4+IEkgZ290IG1lcmdlIGNvbmZsaWN0cywgdXN1YWxseSBpbiB0aGUgZmlsZSBpbnRl Z3JhdGlvbi1tYW5pZmVzdCwgYnV0Cj4gPj4+PiBzb21ldGltZXMgYWxzbyBpbiBzb3VyY2UgZmls ZXMuCj4gPj4+Pgo+ID4+Pj4gVGhhdCdzIGxvb2tzIHNvbWV3aGF0IHdlaXJkIGJlY2F1c2UgSSBk aWRuJ3QgdG91Y2ggYW55IG9mIHRoZSBmaWxlcyBpbgo+ID4+Pj4gdGhlIHRyZWUgYW5kIEkgdGhv dWdodCB0aGF0IGFmdGVyIGNsb25pbmcgYSBmcmVxdWVudCAiZ2l0IHB1bGwiIHdpbGwKPiA+Pj4+ IGtlZXAgbWUgdXAgdG8gZGF0ZSB3aXRob3V0IHRoZSBuZWVkIHRvIHJlc29sdmUgbWVyZ2UgY29u ZmxpY3RzLgo+ID4+Pj4KPiA+Pj4+IFdoYXQgaXMgd3Jvbmcgd2l0aCBteSB0aG91Z2h0PyBXaGF0 IGRpZCBJIGRvIHdyb25nPwo+ID4+Pgo+ID4+PiAtbmlndGhseSBpcyBhIHJlYmFzaW5nIHRyZWUs IGdpdCBwdWxsIGRvZXMgdGhlIHdyb25nIHRoaW5nIGZvciB0aGF0LiBUaGUKPiA+Pj4gcHJvcGVy IHdheSB0byB0cmFjayByZWJhc2luZyBicmFuY2hlcyBpcyAoYXNzdW1pbmcgeW91IGhhdmUgbm8g bG9jYWwKPiA+Pj4gcGF0Y2hlcyB0aGF0IHlvdSB3YW50IHRvIGtlZXApOgo+ID4+Pgo+ID4+PiAk IGdpdCBmZXRjaCBvcmlnaW4KPiA+Pj4gJCBnaXQgcmVzZXQgLS1oYXJkIEB7dXBzdHJlYW19Cj4g Pj4+Cj4gPj4+PiBTZWNvbmQsIEkgcHVsbGVkIHRoZSAiTGludXMiLXRyZWUgdG9kYXkgYW5kIGZv dW5kIHNvbWUgbG9nIGVudHJpZXMgdGhhdAo+ID4+Pj4gc2FpZAo+ID4+Pj4gIE1lcmdlIGJyYW5j aCAnZHJtLWZpeGVzLTQuMScgb2YKPiA+Pj4+IGdpdDovL3Blb3BsZS5mcmVlZGVza3RvcC5vcmcv fmFnZDVmL2xpbnV4IGludG8gZHJtLWZpeGVzCj4gPj4+Pgo+ID4+Pj4gYW5kCj4gPj4+PiAgTWVy Z2UgdGFnICdkcm0taW50ZWwtZml4ZXMtMjAxNS0wNS0yMScgb2YKPiA+Pj4+IGdpdDovL2Fub25n aXQuZnJlZWRlc2t0b3Aub3JnL2RybS1pbnRlbCBpbnRvIGRybS1maXhlcwo+ID4+Pj4KPiA+Pj4+ IFNvIEkgYXNzdW1lZCwgdGhhdCB0aGUgZml4IEkgcHJvdmVkIHRvIHdvcmsgb25lIHdlZWsgYWdv IG5vdyBzaG91bGQgYWxzbwo+ID4+Pj4gYmUgYXZhaWxhYmxlIGluIHRoZSAidmFuaWxsYSIgdHJl ZS4gU28gSSBjb21waWxlZCB0aGF0IG9uIG15IHRlc3QKPiA+Pj4+IG1hY2hpbmUgYW5kIGdvdCBt eSBidWcgYmFjay4gOi0oCj4gPj4+Pgo+ID4+Pj4gU28gbXkgb3RoZXIgcXVlc3Rpb24gaXMsIGhv dyBkbyBmaXhlcyBmcm9tIGRybS1pbnRlbC1uaWdodGx5IGZpbmQgdGhlaXIKPiA+Pj4+IHdlYXkg aW50byB0aGUgInZhbmlsbGEiIGxpbnV4IHRyZWU/IElzIHRoZXJlIHNvbWUgc29ydCBvZiBwcm9j ZXNzCj4gPj4+PiBkZXNjcmlwdGlvbi4KPiA+Pj4KPiA+Pj4gSXQgdGFrZXMgYSB3aGlsZS4gSWYg dGhlIHBhdGNoIGlzIGluIGRybS1pbnRlbC1maXhlcywgaXQgd2lsbCBmaXJzdCBnb3QgdG8KPiA+ Pj4gZHJtLWZpeGVzIGFuZCB0aGVuIHRvIHZhbmlsbGEgdXBzdHJlYW0sIHRoZW4gdG8gc3RhYmxl IGtlcm5lbHMgKGlmIGl0J3MKPiA+Pj4gY2M6IHN0YWJsZSkuIFlvdSBjYW4gY2hlY2sgd2hpY2gg YnJhbmNoIGEgcGF0Y2ggaXMgaW4gYWxyZWFkeSB3aXRoCj4gPj4KPiA+PiBIb3dldmVyIHdlIGRv bid0IG5lY2Vzc2FyaWx5IHF1ZXVlIFNreWxha2UgZml4ZXMgdG8gdGhlIGN1cnJlbnQKPiA+PiBk ZXZlbG9wbWVudCBrZXJuZWxzIHRocm91Z2ggZHJtLWludGVsLWZpeGVzL2RybS1maXhlcywgYXMg dGhlIFNreWxha2UKPiA+PiBzdXBwb3J0IHRoZXJlIGlzIGFueXdheSBwcmVsaW1pbmFyeSwgdGhl IGZpeCAoSSBkb24ndCB0aGluayB3ZSBmaWd1cmVkCj4gPj4gb3V0IHdoaWNoIGV4YWN0IGNvbW1p dCBpdCB3YXMsIGRpZCB3ZT8pIG1heSBvbmx5IGVuZCB1cCB1cHN0cmVhbSBhZnRlcgo+ID4+IHRo ZSBuZXh0IG1lcmdlIHdpbmRvdywgaS5lLiBhdCB2NC4yLXJjMS4KPiA+Cj4gPiBTbyA0LjEgd29u J3QgY3V0IGl0IG9uIHNreWxha2U/IEknbSBub3Qgc3VyZSBldmVyeW9uZSBpbiBJbnRlbCBpcyBh d2FyZS4KPiAKPiBNeSBhcHByb2FjaCBoYXMgYmVlbiB0aGF0IEkgZG9uJ3QgcXVldWUgZml4ZXMg dG8gY3VycmVudCBkZXZlbG9wbWVudAo+IGtlcm5lbHMgZm9yIHBsYXRmb3JtcyB0aGF0IHN0aWxs IHJlcXVpcmUgaTkxNS5wcmVsaW1pbmFyeV9od19zdXBwb3J0PTEKPiBvciBDT05GSUdfRFJNX0k5 MTVfUFJFTElNSU5BUllfSFdfU1VQUE9SVD15LiBPYnZpb3VzbHkgc2FtZSBmb3IKPiBzdGFibGUu IEkgZG9uJ3QgdGhpbmsgdGhpcyBpcyB1bnJlYXNvbmFibGUuCj4gCj4gQmFzaWNhbGx5IHByZWxp bWluYXJ5IG1lYW5zIHRoZSBpbXBsZW1lbnRhdGlvbiBkb2VzIG5vdCBoYXZlIGZlYXR1cmUKPiBw YXJpdHkgd2l0aCB0aGUgcHJlY2VkaW5nIHBsYXRmb3JtLCBhbmQgaXMgZXhwZWN0ZWQgdG8gYmUg cm91Z2ggYXJvdW5kCj4gdGggZWRnZXMuCj4gCj4gU2t5bGFrZSBzdGlsbCByZXF1aXJlcyB0aGUg cHJlbGltaW5hcnkgZmxhZyBldmVuIGluCj4gZHJtLWludGVsLW5pZ2h0bHkuIERhbWllbiwgc2hv dWxkIHdlIGRyb3AgcHJlbGltaW5hcnkgZm9yIFNreWxha2UgaW4KPiB2NC4yPyBPciBhbHJlYWR5 IGluIHY0LjE/Cgp0aGUgcGxhbmVzIGFiaSBpbiBza2wgaXMgc3RpbGwgd3JvbmcsIHdlIGV4cG9z ZSBib3RoIHRvcCBwbGFuZSBib3RoIGFzIHRoZQpuZXcgdW5pZmllZCBwbGFuZSBhbmQgdGhyb3Vn aCB0aGUgY3Vyc29yIGJhY2t3YXJkcyBpbnRlcmZhY2UgdGhlIGh3CnByb3ZpZGVzLiBVbnRpbCB0 aGF0J3MgZml4ZWQgKGFuZCB0aGF0J3Mgbm90IHRoZSBjYXNlIGZvciA0LjIpIHNrbCBpc24ndApy ZWFkeSBpbW8uIEl0J3MgYSBmYWlybHkgc21hbGwgcGF0Y2gsIHdlIG9ubHkgbmVlZCB0byBzdG9w IHJlZ2lzdGVyaW5nIHRoZQpsZWdhY3kgY3Vyc29yIHBsYW5lIGFuZCBtYXJrIHRoZSB0b3AgcGxh bmUgYXMgdGhlIGN1cnNvciBvbmUgZm9yIGJhY2t3YXJkcwphYmkgcHVycG9zZXMuCi1EYW5pZWwK LS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0 dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==