From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: The i915 stable patch marking is totally broken Date: Thu, 16 Mar 2017 23:02:31 +0900 Message-ID: <20170316140231.GA1076@kroah.com> References: <20170312194440.GA32007@kroah.com> <20170312204621.vzvmzgnuio2fqmr7@phenom.ffwll.local> <20170312220121.GB30510@kroah.com> <20170316073830.23jcxeff4wyurgak@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BCAA6EAF7 for ; Thu, 16 Mar 2017 14:02:47 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170316073830.23jcxeff4wyurgak@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Jani Nikula , intel-gfx , Linux Kernel Mailing List , stable List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBNYXIgMTYsIDIwMTcgYXQgMDg6Mzg6MzBBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBIaSBHcmVnLAo+IAo+IE9uIE1vbiwgTWFyIDEzLCAyMDE3IGF0IDA3OjQwOjUwQU0g KzAxMDAsIERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4gPiBPbiBTdW4sIE1hciAxMiwgMjAxNyBhdCAx MTowMSBQTSwgR3JlZyBLSCA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+IHdyb3RlOgo+ID4g PiBTbyBpZiBhIGNvbW1pdCBzYXlzICJjaGVycnktcGljayIsIEkgZ3Vlc3MgSSBjYW4gYWx3YXlz IGFzc3VtZSBpdCdzIHNhZmUKPiA+ID4gdG8gYWRkLCByaWdodD8gIElmIG5vdCwgX3RoZW5fIEkg aGF2ZSB0byBydW4gdGhlICJzZWFyY2ggYmFja3dhcmRzIgo+ID4gPiBsb2dpYywgcmlnaHQ/Cj4g PiA+Cj4gPiA+IE9rLCBsZXQgbWUgdGhpbmsgYWJvdXQgdGhpcyBhIGJpdCB0byBzZWUgaWYgdGhh dCdzIHBvc3NpYmxlIHRvIHNjcmlwdC4uLgo+ID4gCj4gPiBZZXMsIGJ1dCBpdCBzaG91bGRuJ3Qg YmUgaGFyZCB0byBhdm9pZCB0aGUgbGluZWFyIHNlYXJjaDoKPiA+IAo+ID4gMS4gbWFrZSBzdXJl IHlvdSBoYXZlIHRoZSBsYXRlc3QgbGludXgtbmV4dCAodG8gbWFrZSBzdXJlIGFsbCB0aGUgc2hh MQo+ID4gY29tbWl0LWlzaCByZXNvbHZlIHRvIHNvbWV0aGluZyBtZWFuaW5nZnVsKS4gWW91IHBy b2JhYmx5IHdhbnQgdG8gZG8KPiA+IHRoYXQgYmVmb3JlIHlvdSBib2FyZCBhIHBsYW5lIDotKQo+ ID4gCj4gPiAyLiBXaGVuIHlvdSBwYXJzZSBhbiB1cHN0cmVhbSBjb21taXQgdGhhdCBzYXlzICJj b21taXQgY2hlcnJ5LXBpY2tlZAo+ID4gZnJvbSAkb3JpZ2luYWxfc2hhMSIsIHRoZW4gYWRkIGEg Z2l0IG5vdGUgZm9yICRvcmlnaW5hbF9zaGExIHRoYXQKPiA+IHlvdSd2ZSBzZWVuIGl0IGFscmVh ZHkgYW5kIGNhbiBpZ25vcmUgaXQuCj4gPiAKPiA+IDMuIFJ1biB0aGF0IHNjcmlwdCBvdmVyIHY0 LjkuLnY0LjEwIHRvIGJhY2tmaWxsIHlvdXIgZ2l0IG5vdGVzIGJyYW5jaC4KPiA+IAo+ID4gNC4g TWFrZSBzdXJlIHlvdSBzeW5jIHRoYXQgZ2l0IG5vdGVzIGJyYW5jaCAoYW5kIGlmIHlvdSB1c2Ug Z2l0IG5vdGVzCj4gPiBhbHJlYWR5LCBqdXN0IHVzZSBhIGRpZmZlcmVudCBnaXQgbm90ZXMgYnJh bmNoIG5hbWUgdG8gYXZvaWQKPiA+IGNvbmZsaWN0cykuCj4gPiAKPiA+IDUuIFdoZW4geW91IHNw b3QgYSBwYXRjaCB3aXRoIGNjOiBzdGFibGUsIGNoZWNrIGZvciBhIGdpdCBub3RlIHRoYXQKPiA+ IHNheXMgeW91J3ZlIGxvb2tlZCBhdCBpdCAob3Igb25lIG9mIGl0J3MgY2hlcnJ5LXBpY2tzKSBh bHJlYWR5LCBpZiBzbywKPiA+IHNpbGVudGx5IGlnbm9yZSBpdC4KPiA+IAo+ID4gVGhhdCBzaG91 bGQgbWFzc2l2ZWx5IGRyb3AgdGhlIHJhdGlvIG9mIGZhaWxlZCBwYXRjaGVzLCBhdCBsZWFzdCBl dmVyeQo+ID4gdGltZSBJIGxvb2sgYXQgeW91ciBmYWlsZWQgcGF0Y2hlIG1haWwgSSB0aGluayB0 aGV5J3JlIGp1c3QKPiA+IGRvdWJsZS1hcHBsaWVkIG9uZXMuIFRoZXJlJ3Mgb2ZjIGEgZmV3IHBh dGNoZXMgdGhhdCBmYWlsIHRvIGFwcGx5LCAzCj4gPiBtb250aHMgb2YgZHJtL2k5MTUgZGV2ZWxv cG1lbnQgZXZlbiB3cmVhayB0aGUgY29udGV4dCBvZiBzaW1wbGUKPiA+IGJ1Z2ZpeGVzIHNvbWV0 aW1lcywgYnV0IG1vc3QgYXJlIG5vdCAod2hpY2ggaXMgYnR3IHdoeSB5b3UgZG9uJ3QgZ2V0Cj4g PiByZXBsaWVzIGZvciBtb3N0IG9mIHRoZXNlKS4KPiAKPiBBcmUgeW91IGltcGxlbWVudGluZyB0 aGlzPyBJZiB5b3UgbmVlZCBpbnNwaXJhdGlvbiwgd2UgYWxzbyBoYXZlIGEgZmFpcmx5Cj4gZ2Vu ZXJpYyBjaGVycnktcGljayBicmFuY2ggY29tbWFuZCwgd2hpY2ggZmlsdGVycyBvdXQgZHVwbGlj YXRlZCBjaGVycnkKPiBwaWNrcyBhbHJlYWR5IHdpdGg6Cj4gCj4gICAgIGdpdCBsb2cgZHJtLWlu dGVsLWZpeGVzIC0tZm9ybWF0PWZvcm1hdDolaCAtLWFmdGVyPTZtb250aHMgXAo+IAkJICAgIC0t Z3JlcD0iY2hlcnJ5IHBpY2tlZCAuKiAkY29tbWl0Igo+IAo+IFNlZSBodHRwczovL2NnaXQuZnJl ZWRlc2t0b3Aub3JnL2RybS1pbnRlbC90cmVlL2RpbT9oPW1haW50YWluZXItdG9vbHMjbjcxMwo+ IAo+IFBsZWFzZSBtYWtlIHN1cmUgeW91IGhhdmUgc29tZXRoaW5nIGxpa2UgdGhpcyByZWFkeSBz b29uLCBvdGhlcndpc2Ugd2UncmUKPiBnb2luZyB0byBoYXZlIHRoaXMgZXhhY3QgY29udmVyc2F0 aW9uIGFnYWluLCBsaWtlIHdlIGRpZCBmb3IgdGhlIGxhc3QgZmV3Cj4gbWVyZ2Ugd2luZG93cyAu Li4gOigKPiAKPiBJZiB5b3UgY2FuJ3QgaW1wbGVtZW50IHRoaXMsIHRoZW4gSSBndWVzcyB3ZSBo YXZlIHRvIHRyeSB0byBhdm9pZAo+IGRvdWJsZS10YWdnaW5nIHN0dWZmIHdpdGggY2M6IHN0YWJs ZS4gQnV0IHRoYXQgd2lsbCB3b3JrIGFnYWluc3QgMTArIHllYXJzCj4gb2YgInBscyBjYzogc3Rh YmxlIGJ1Z2ZpeGVzIiB0cmFpbmluZyBmcm9tIHlvdS4gQW5kIHdlJ2QgbmVlZCB0byBwcmVkaWN0 Cj4gd2hlbiBleGFjdGx5IHRoZSBtZXJnZSB3aW5kb3cgY3V0b2ZmIGlzLiBXaGljaCBpcyBnb2lu ZyB0byBnZXQgaXQgd3JvbmcgYnkKPiAxLTIgd2Vla3MgZWFjaCByZWxlYXNlLCBzbyB0cnlpbmcg dG8gZml4IHRoaXMgb24gb3VyIHNpZGUgd2lsbCBiZSBhdCBiZXN0Cj4gYW4gODAlIHNvbHV0aW9u LCBhZnRlciAxeSBvZiBoYXJkIHJlLXRyYWluaWcgd29yayA6KAoKU29ycnksIEkgaGF2ZW4ndCBo YWQgdGhlIGNoYW5jZSB0byBsb29rIGF0IHRoaXMgYWdhaW4uCgpCdXQsIEkgc3RpbGwgdGhpbmsg dGhpcyBpcyB3cm9uZywgeW91IGFyZSBnZXR0aW5nIGNvbW1pdHMgaW50byBMaW51cydzCnRyZWUg dGhhdCBoYXZlIGdpdCBjb21taXQgaWRzIHRoYXQgaG9wZWZ1bGx5IHNob3cgdXAgMyBtb250aHMg bGF0ZXIuClRoYXQgZmVlbHMgYmFkIGZyb20gYSAiY29uc2lzdGVuY3kiIHBvaW50IG9mIHZpZXcu CgpXaHkgbm90IHN3aXRjaCBpdCBhcm91bmQsIGFuZCBhcHBseSB0aGUgcGF0Y2ggdG8geW91ciAi c3RhYmxlIiBicmFuY2gKYW5kIHRoZW4gY2hlcnJ5LXBpY2sgaXQgdG8geW91ciAibmV4dCIgYnJh bmNoPyAgVGhhdCB3YXkgSSBjYW4ganVzdAppZ25vcmUgYW55IHBhdGNoIHRoYXQgaGFzICJjaGVy cnktcGljayIgaW4gaXQsIG5vdCBldmVyIG5lZWQgdG8gbWVzcwp3aXRoICdnaXQgbm90ZXMnIChu b3QgdGhhdCBJIHByb2JhYmx5IHdvdWxkIGFueXdheSwgdGhleSBhcmUgaG9ycmlkKSwKYW5kIHRo ZSB0cmVlIGlzIGFsd2F5cyBzZW1pLXNhbmUuICBBbmQgaXQgd291bGQgcHJldmVudCBtZSBmcm9t IGhhdmluZwp0byBtZXNzIHdpdGggbGludXgtbmV4dCwgd2hpY2ggSSBhbHNvIGRvbid0IHdhbnQg dG8gaGF2ZSB0byBkby4KRXNwZWNpYWxseSBmb3Igc3RhYmxlIHdvcmssIHRoYXQganVzdCBmZWVs cyBzbyB3cm9uZywgYXMgc3RhYmxlIHN0dWZmCnNob3VsZCBub3QgYmUgZGVwZW5kaW5nIG9uIHN0 dWZmIHRoYXQgaGFzbid0IGV2ZW4gaGl0IExpbnVzJ3MgdHJlZSB5ZXQsCmFuZCBtaWdodCBuZXZl ci4KCkFuZCBhZ2FpbiwgeW91IGFsbCBhcmUgdGhlIG9ubHkgb25lcyB0aGF0IGhhdmUgdGhpcyBp c3N1ZS4gIFlvdSBtaWdodApmaW5kIGEgaGFuZGZ1bGwgb2YgcGF0Y2hlcyBmb3Igc3RhYmxlIHRo YXQgY29tZSBpbiB0d2ljZSBpbiB0aGUgcmVzdCBvZgp0aGUga2VybmVsLCBidXQgeW91ciAibGl0 dGxlIiBkcml2ZXIgZHdhcmZzIHRoYXQgYnkgYW4gb3JkZXIgb2YKbWFnbml0dWRlLiAgSSByZWFs bHkgdGhpbmsgeW91IGFyZSBkb2luZyBpdCB3cm9uZywgbm8gb25lIGVsc2Ugc2VlbXMgdG8KaGF2 ZSB0aGlzIGlzc3VlLi4uCgpJJ2xsIGJlIGJhY2sgaG9tZSBuZXh0IHdlZWsgYW5kIGxvb2sgaW50 byB3cml0aW5nIHNvbWUgc2NyaXB0cyBmb3IgdGhpcywKYnV0IHBsZWFzZSBjb25zaWRlciBqdXN0 IHN3aXRjaGluZyB5b3VyICJ3aGljaCBicmFuY2ggZG9lcyBpdCBnbyBpbnRvCmZpcnN0IiBtb2Rl bCwgd2hpY2ggd291bGQgcmVhbGx5IHNhdmUgbWUgYSB0b24gb2YgdGltZSwgYW5kIHJlbW92ZQpj b25mdXNpb24gZnJvbSBhbnlvbmUgd2hvIGV2ZXIgcnVucyBhY3Jvc3Mgb25lIG9mIHRoZXNlIGNo ZXJyeS1waWNrCm1lc3NhZ2VzLgoKdGhhbmtzLAoKZ3JlZyBrLWgKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752462AbdCPOCs (ORCPT ); Thu, 16 Mar 2017 10:02:48 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55440 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751956AbdCPOCr (ORCPT ); Thu, 16 Mar 2017 10:02:47 -0400 Date: Thu, 16 Mar 2017 23:02:31 +0900 From: Greg KH To: Daniel Vetter , Jani Nikula , intel-gfx , Linux Kernel Mailing List , stable Subject: Re: [Intel-gfx] The i915 stable patch marking is totally broken Message-ID: <20170316140231.GA1076@kroah.com> References: <20170312194440.GA32007@kroah.com> <20170312204621.vzvmzgnuio2fqmr7@phenom.ffwll.local> <20170312220121.GB30510@kroah.com> <20170316073830.23jcxeff4wyurgak@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170316073830.23jcxeff4wyurgak@phenom.ffwll.local> User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 16, 2017 at 08:38:30AM +0100, Daniel Vetter wrote: > Hi Greg, > > On Mon, Mar 13, 2017 at 07:40:50AM +0100, Daniel Vetter wrote: > > On Sun, Mar 12, 2017 at 11:01 PM, Greg KH wrote: > > > So if a commit says "cherry-pick", I guess I can always assume it's safe > > > to add, right? If not, _then_ I have to run the "search backwards" > > > logic, right? > > > > > > Ok, let me think about this a bit to see if that's possible to script... > > > > Yes, but it shouldn't be hard to avoid the linear search: > > > > 1. make sure you have the latest linux-next (to make sure all the sha1 > > commit-ish resolve to something meaningful). You probably want to do > > that before you board a plane :-) > > > > 2. When you parse an upstream commit that says "commit cherry-picked > > from $original_sha1", then add a git note for $original_sha1 that > > you've seen it already and can ignore it. > > > > 3. Run that script over v4.9..v4.10 to backfill your git notes branch. > > > > 4. Make sure you sync that git notes branch (and if you use git notes > > already, just use a different git notes branch name to avoid > > conflicts). > > > > 5. When you spot a patch with cc: stable, check for a git note that > > says you've looked at it (or one of it's cherry-picks) already, if so, > > silently ignore it. > > > > That should massively drop the ratio of failed patches, at least every > > time I look at your failed patche mail I think they're just > > double-applied ones. There's ofc a few patches that fail to apply, 3 > > months of drm/i915 development even wreak the context of simple > > bugfixes sometimes, but most are not (which is btw why you don't get > > replies for most of these). > > Are you implementing this? If you need inspiration, we also have a fairly > generic cherry-pick branch command, which filters out duplicated cherry > picks already with: > > git log drm-intel-fixes --format=format:%h --after=6months \ > --grep="cherry picked .* $commit" > > See https://cgit.freedesktop.org/drm-intel/tree/dim?h=maintainer-tools#n713 > > Please make sure you have something like this ready soon, otherwise we're > going to have this exact conversation again, like we did for the last few > merge windows ... :( > > If you can't implement this, then I guess we have to try to avoid > double-tagging stuff with cc: stable. But that will work against 10+ years > of "pls cc: stable bugfixes" training from you. And we'd need to predict > when exactly the merge window cutoff is. Which is going to get it wrong by > 1-2 weeks each release, so trying to fix this on our side will be at best > an 80% solution, after 1y of hard re-trainig work :( Sorry, I haven't had the chance to look at this again. But, I still think this is wrong, you are getting commits into Linus's tree that have git commit ids that hopefully show up 3 months later. That feels bad from a "consistency" point of view. Why not switch it around, and apply the patch to your "stable" branch and then cherry-pick it to your "next" branch? That way I can just ignore any patch that has "cherry-pick" in it, not ever need to mess with 'git notes' (not that I probably would anyway, they are horrid), and the tree is always semi-sane. And it would prevent me from having to mess with linux-next, which I also don't want to have to do. Especially for stable work, that just feels so wrong, as stable stuff should not be depending on stuff that hasn't even hit Linus's tree yet, and might never. And again, you all are the only ones that have this issue. You might find a handfull of patches for stable that come in twice in the rest of the kernel, but your "little" driver dwarfs that by an order of magnitude. I really think you are doing it wrong, no one else seems to have this issue... I'll be back home next week and look into writing some scripts for this, but please consider just switching your "which branch does it go into first" model, which would really save me a ton of time, and remove confusion from anyone who ever runs across one of these cherry-pick messages. thanks, greg k-h