From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935594AbdCLWFL (ORCPT ); Sun, 12 Mar 2017 18:05:11 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:43432 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935393AbdCLWFF (ORCPT ); Sun, 12 Mar 2017 18:05:05 -0400 Date: Sun, 12 Mar 2017 23:01:21 +0100 From: Greg KH To: Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] The i915 stable patch marking is totally broken Message-ID: <20170312220121.GB30510@kroah.com> References: <20170312194440.GA32007@kroah.com> <20170312204621.vzvmzgnuio2fqmr7@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170312204621.vzvmzgnuio2fqmr7@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 Sun, Mar 12, 2017 at 09:46:21PM +0100, Daniel Vetter wrote: > On Sun, Mar 12, 2017 at 08:44:40PM +0100, Greg KH wrote: > > Hi Daniel and Jani and other members of the i915-commit-cabal, > > > > I've mentioned this a few times to Daniel in the past (like at the last > > kernel summit), but the way you all are handling the tagging of patches > > for inclusion in stable kernel releases is totally broken and causing me > > no end of headaches. > > > > It's due to your "you have a branch, you have a branch, you all have a > > branch!" model of development. You have patches that end up flowing in > > to Linus's trees multiple times for different releases. Now git is > > smart enough to handle most of this, and you end up doing a lot of > > hand-fixing for other merge issues, but when it comes to doing the > > stable kernel work, none of that means squat. All I get to see is when > > a patch lands in Linus's tree, and if that patch has a "cc: stable@" > > marking, then I look at it. > > > > But, when a patch hits Linus through multiple branches, that means I see > > it multiple times, usually months apart in timeframe. This is > > especially bad during the -rc1 merge window when all of the old work you > > all did for the past 3 months hits Linus, which includes all of the old > > bugfixes that were already in the previous kernel release. > > > > I think there were over 25 different patches in -rc1 that hit this > > issue. Maybe more, maybe less, I don't know, I'm giving up at this > > point, I wasted over 2 hours trying to figure out a way to do this in an > > automated way, or by hand, or something else to deal with all of these > > rejections or "fuzz merge" which really was a duplicate. > > > > And the joy of your "cherry-picked from 12345..." messages, with git > > commit ids that are no where to be found in Linus's tree at all, is > > totally annoying as well, why even have this if it doesn't mean > > anything? I sure can't use it. > > > > Not to mention all of the build-breakages, and normal "fails to apply" > > that you all end up with, your driver subsystem has the largest instance > > of those as well, and build-breakages are the worst, as they cause my > > process to come to a screeching halt while I have to bisect to find the > > broken patch. Given the lack of patches that people actually send me > > when I send in the "FAILED" emails, I'm guessing that you all don't care > > that much about stable kernels either, which is fine, as again, I'm > > giving up on your driver. > > > > So, either you all only mark a patch _ONCE_. Or come up with some way > > for me to determine, in an automated way that a patch is already in > > Linus's older release, or just don't mark anything and send me a > > hand-curated list of git commit ids, or patches in mbox form (like DaveM > > does), or something else you all come up with. What is happening now is > > not working at all, and as of now, I'm going to just drop all i915 > > patches with a cc: stable marking on the floor. > > > > Congrats on being the first subsystem that I've had to blacklist from my > > stable patch workflow :( > > > > greg "35k feet above India and grumpy" k-h > > So I blame this on flight level 350, but we discussed this at kernel > summit. Every patch we cherry-pick over comes with a "cherry-picked from > $sha1" line, as long as you ignore any such sha1 as duplicate you won't > see the same patch twice. I tried that, but that cherry-pick number doesn't seem to match up with anything in Linus's tree. Where are those numbers coming from? Or there aren't numbers at all. Look at commit: 8726f2faa371514fba2f594d799db95203dfeee0. It just showed up in Linus's tree, and there's no "cherry-pick" number in there. It ended up in 4.9.7. Hm, ok, you want me to look at the commit id and then search to see if it's already been merged "before". Ah, that's crazy. So I need to do that for every i915 patch? Search backwards? Ugh, that's a mess, no wonder I couldn't figure it out... > Iirc you said you'll implement this in your scripts, and as long as we > never break this rule, you'll be fine. Since you seemed to have agreed to > a solution that would solve all your headaches I didn't bother doing > any changes on our side here. 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... > what happened? Has bashing drm become the cool thing to do somehow? I don't understand, I haven't bashed drm in years :) thanks, greg "jet lagged" k-h From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: The i915 stable patch marking is totally broken Date: Sun, 12 Mar 2017 23:01:21 +0100 Message-ID: <20170312220121.GB30510@kroah.com> References: <20170312194440.GA32007@kroah.com> <20170312204621.vzvmzgnuio2fqmr7@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 540696E22E for ; Sun, 12 Mar 2017 22:04:59 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170312204621.vzvmzgnuio2fqmr7@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@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gU3VuLCBNYXIgMTIsIDIwMTcgYXQgMDk6NDY6MjFQTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBTdW4sIE1hciAxMiwgMjAxNyBhdCAwODo0NDo0MFBNICswMTAwLCBHcmVnIEtI IHdyb3RlOgo+ID4gSGkgRGFuaWVsIGFuZCBKYW5pIGFuZCBvdGhlciBtZW1iZXJzIG9mIHRoZSBp OTE1LWNvbW1pdC1jYWJhbCwKPiA+IAo+ID4gSSd2ZSBtZW50aW9uZWQgdGhpcyBhIGZldyB0aW1l cyB0byBEYW5pZWwgaW4gdGhlIHBhc3QgKGxpa2UgYXQgdGhlIGxhc3QKPiA+IGtlcm5lbCBzdW1t aXQpLCBidXQgdGhlIHdheSB5b3UgYWxsIGFyZSBoYW5kbGluZyB0aGUgdGFnZ2luZyBvZiBwYXRj aGVzCj4gPiBmb3IgaW5jbHVzaW9uIGluIHN0YWJsZSBrZXJuZWwgcmVsZWFzZXMgaXMgdG90YWxs eSBicm9rZW4gYW5kIGNhdXNpbmcgbWUKPiA+IG5vIGVuZCBvZiBoZWFkYWNoZXMuCj4gPiAKPiA+ IEl0J3MgZHVlIHRvIHlvdXIgInlvdSBoYXZlIGEgYnJhbmNoLCB5b3UgaGF2ZSBhIGJyYW5jaCwg eW91IGFsbCBoYXZlIGEKPiA+IGJyYW5jaCEiIG1vZGVsIG9mIGRldmVsb3BtZW50LiAgWW91IGhh dmUgcGF0Y2hlcyB0aGF0IGVuZCB1cCBmbG93aW5nIGluCj4gPiB0byBMaW51cydzIHRyZWVzIG11 bHRpcGxlIHRpbWVzIGZvciBkaWZmZXJlbnQgcmVsZWFzZXMuICBOb3cgZ2l0IGlzCj4gPiBzbWFy dCBlbm91Z2ggdG8gaGFuZGxlIG1vc3Qgb2YgdGhpcywgYW5kIHlvdSBlbmQgdXAgZG9pbmcgYSBs b3Qgb2YKPiA+IGhhbmQtZml4aW5nIGZvciBvdGhlciBtZXJnZSBpc3N1ZXMsIGJ1dCB3aGVuIGl0 IGNvbWVzIHRvIGRvaW5nIHRoZQo+ID4gc3RhYmxlIGtlcm5lbCB3b3JrLCBub25lIG9mIHRoYXQg bWVhbnMgc3F1YXQuICBBbGwgSSBnZXQgdG8gc2VlIGlzIHdoZW4KPiA+IGEgcGF0Y2ggbGFuZHMg aW4gTGludXMncyB0cmVlLCBhbmQgaWYgdGhhdCBwYXRjaCBoYXMgYSAiY2M6IHN0YWJsZUAiCj4g PiBtYXJraW5nLCB0aGVuIEkgbG9vayBhdCBpdC4KPiA+IAo+ID4gQnV0LCB3aGVuIGEgcGF0Y2gg aGl0cyBMaW51cyB0aHJvdWdoIG11bHRpcGxlIGJyYW5jaGVzLCB0aGF0IG1lYW5zIEkgc2VlCj4g PiBpdCBtdWx0aXBsZSB0aW1lcywgdXN1YWxseSBtb250aHMgYXBhcnQgaW4gdGltZWZyYW1lLiAg VGhpcyBpcwo+ID4gZXNwZWNpYWxseSBiYWQgZHVyaW5nIHRoZSAtcmMxIG1lcmdlIHdpbmRvdyB3 aGVuIGFsbCBvZiB0aGUgb2xkIHdvcmsgeW91Cj4gPiBhbGwgZGlkIGZvciB0aGUgcGFzdCAzIG1v bnRocyBoaXRzIExpbnVzLCB3aGljaCBpbmNsdWRlcyBhbGwgb2YgdGhlIG9sZAo+ID4gYnVnZml4 ZXMgdGhhdCB3ZXJlIGFscmVhZHkgaW4gdGhlIHByZXZpb3VzIGtlcm5lbCByZWxlYXNlLgo+ID4g Cj4gPiBJIHRoaW5rIHRoZXJlIHdlcmUgb3ZlciAyNSBkaWZmZXJlbnQgcGF0Y2hlcyBpbiAtcmMx IHRoYXQgaGl0IHRoaXMKPiA+IGlzc3VlLiAgTWF5YmUgbW9yZSwgbWF5YmUgbGVzcywgSSBkb24n dCBrbm93LCBJJ20gZ2l2aW5nIHVwIGF0IHRoaXMKPiA+IHBvaW50LCBJIHdhc3RlZCBvdmVyIDIg aG91cnMgdHJ5aW5nIHRvIGZpZ3VyZSBvdXQgYSB3YXkgdG8gZG8gdGhpcyBpbiBhbgo+ID4gYXV0 b21hdGVkIHdheSwgb3IgYnkgaGFuZCwgb3Igc29tZXRoaW5nIGVsc2UgdG8gZGVhbCB3aXRoIGFs bCBvZiB0aGVzZQo+ID4gcmVqZWN0aW9ucyBvciAiZnV6eiBtZXJnZSIgd2hpY2ggcmVhbGx5IHdh cyBhIGR1cGxpY2F0ZS4KPiA+IAo+ID4gQW5kIHRoZSBqb3kgb2YgeW91ciAiY2hlcnJ5LXBpY2tl ZCBmcm9tIDEyMzQ1Li4uIiBtZXNzYWdlcywgd2l0aCBnaXQKPiA+IGNvbW1pdCBpZHMgdGhhdCBh cmUgbm8gd2hlcmUgdG8gYmUgZm91bmQgaW4gTGludXMncyB0cmVlIGF0IGFsbCwgaXMKPiA+IHRv dGFsbHkgYW5ub3lpbmcgYXMgd2VsbCwgd2h5IGV2ZW4gaGF2ZSB0aGlzIGlmIGl0IGRvZXNuJ3Qg bWVhbgo+ID4gYW55dGhpbmc/ICBJIHN1cmUgY2FuJ3QgdXNlIGl0Lgo+ID4gCj4gPiBOb3QgdG8g bWVudGlvbiBhbGwgb2YgdGhlIGJ1aWxkLWJyZWFrYWdlcywgYW5kIG5vcm1hbCAiZmFpbHMgdG8g YXBwbHkiCj4gPiB0aGF0IHlvdSBhbGwgZW5kIHVwIHdpdGgsIHlvdXIgZHJpdmVyIHN1YnN5c3Rl bSBoYXMgdGhlIGxhcmdlc3QgaW5zdGFuY2UKPiA+IG9mIHRob3NlIGFzIHdlbGwsIGFuZCBidWls ZC1icmVha2FnZXMgYXJlIHRoZSB3b3JzdCwgYXMgdGhleSBjYXVzZSBteQo+ID4gcHJvY2VzcyB0 byBjb21lIHRvIGEgc2NyZWVjaGluZyBoYWx0IHdoaWxlIEkgaGF2ZSB0byBiaXNlY3QgdG8gZmlu ZCB0aGUKPiA+IGJyb2tlbiBwYXRjaC4gIEdpdmVuIHRoZSBsYWNrIG9mIHBhdGNoZXMgdGhhdCBw ZW9wbGUgYWN0dWFsbHkgc2VuZCBtZQo+ID4gd2hlbiBJIHNlbmQgaW4gdGhlICJGQUlMRUQiIGVt YWlscywgSSdtIGd1ZXNzaW5nIHRoYXQgeW91IGFsbCBkb24ndCBjYXJlCj4gPiB0aGF0IG11Y2gg YWJvdXQgc3RhYmxlIGtlcm5lbHMgZWl0aGVyLCB3aGljaCBpcyBmaW5lLCBhcyBhZ2FpbiwgSSdt Cj4gPiBnaXZpbmcgdXAgb24geW91ciBkcml2ZXIuCj4gPiAKPiA+IFNvLCBlaXRoZXIgeW91IGFs bCBvbmx5IG1hcmsgYSBwYXRjaCBfT05DRV8uICBPciBjb21lIHVwIHdpdGggc29tZSB3YXkKPiA+ IGZvciBtZSB0byBkZXRlcm1pbmUsIGluIGFuIGF1dG9tYXRlZCB3YXkgdGhhdCBhIHBhdGNoIGlz IGFscmVhZHkgaW4KPiA+IExpbnVzJ3Mgb2xkZXIgcmVsZWFzZSwgb3IganVzdCBkb24ndCBtYXJr IGFueXRoaW5nIGFuZCBzZW5kIG1lIGEKPiA+IGhhbmQtY3VyYXRlZCBsaXN0IG9mIGdpdCBjb21t aXQgaWRzLCBvciBwYXRjaGVzIGluIG1ib3ggZm9ybSAobGlrZSBEYXZlTQo+ID4gZG9lcyksIG9y IHNvbWV0aGluZyBlbHNlIHlvdSBhbGwgY29tZSB1cCB3aXRoLiAgV2hhdCBpcyBoYXBwZW5pbmcg bm93IGlzCj4gPiBub3Qgd29ya2luZyBhdCBhbGwsIGFuZCBhcyBvZiBub3csIEknbSBnb2luZyB0 byBqdXN0IGRyb3AgYWxsIGk5MTUKPiA+IHBhdGNoZXMgd2l0aCBhIGNjOiBzdGFibGUgbWFya2lu ZyBvbiB0aGUgZmxvb3IuCj4gPiAKPiA+IENvbmdyYXRzIG9uIGJlaW5nIHRoZSBmaXJzdCBzdWJz eXN0ZW0gdGhhdCBJJ3ZlIGhhZCB0byBibGFja2xpc3QgZnJvbSBteQo+ID4gc3RhYmxlIHBhdGNo IHdvcmtmbG93IDooCj4gPiAKPiA+IGdyZWcgIjM1ayBmZWV0IGFib3ZlIEluZGlhIGFuZCBncnVt cHkiIGstaAo+IAo+IFNvIEkgYmxhbWUgdGhpcyBvbiBmbGlnaHQgbGV2ZWwgMzUwLCBidXQgd2Ug ZGlzY3Vzc2VkIHRoaXMgYXQga2VybmVsCj4gc3VtbWl0LiBFdmVyeSBwYXRjaCB3ZSBjaGVycnkt cGljayBvdmVyIGNvbWVzIHdpdGggYSAiY2hlcnJ5LXBpY2tlZCBmcm9tCj4gJHNoYTEiIGxpbmUs IGFzIGxvbmcgYXMgeW91IGlnbm9yZSBhbnkgc3VjaCBzaGExIGFzIGR1cGxpY2F0ZSB5b3Ugd29u J3QKPiBzZWUgdGhlIHNhbWUgcGF0Y2ggdHdpY2UuCgpJIHRyaWVkIHRoYXQsIGJ1dCB0aGF0IGNo ZXJyeS1waWNrIG51bWJlciBkb2Vzbid0IHNlZW0gdG8gbWF0Y2ggdXAgd2l0aAphbnl0aGluZyBp biBMaW51cydzIHRyZWUuICBXaGVyZSBhcmUgdGhvc2UgbnVtYmVycyBjb21pbmcgZnJvbT8KCk9y IHRoZXJlIGFyZW4ndCBudW1iZXJzIGF0IGFsbC4gIExvb2sgYXQgY29tbWl0Ogo4NzI2ZjJmYWEz NzE1MTRmYmEyZjU5NGQ3OTlkYjk1MjAzZGZlZWUwLiAgSXQganVzdCBzaG93ZWQgdXAgaW4gTGlu dXMncwp0cmVlLCBhbmQgdGhlcmUncyBubyAiY2hlcnJ5LXBpY2siIG51bWJlciBpbiB0aGVyZS4g IEl0IGVuZGVkIHVwIGluCjQuOS43LgoKSG0sIG9rLCB5b3Ugd2FudCBtZSB0byBsb29rIGF0IHRo ZSBjb21taXQgaWQgYW5kIHRoZW4gc2VhcmNoIHRvIHNlZSBpZgppdCdzIGFscmVhZHkgYmVlbiBt ZXJnZWQgImJlZm9yZSIuICBBaCwgdGhhdCdzIGNyYXp5LiAgU28gSSBuZWVkIHRvIGRvCnRoYXQg Zm9yIGV2ZXJ5IGk5MTUgcGF0Y2g/ICBTZWFyY2ggYmFja3dhcmRzPyAgVWdoLCB0aGF0J3MgYSBt ZXNzLCBubwp3b25kZXIgSSBjb3VsZG4ndCBmaWd1cmUgaXQgb3V0Li4uCgo+IElpcmMgeW91IHNh aWQgeW91J2xsIGltcGxlbWVudCB0aGlzIGluIHlvdXIgc2NyaXB0cywgYW5kIGFzIGxvbmcgYXMg d2UKPiBuZXZlciBicmVhayB0aGlzIHJ1bGUsIHlvdSdsbCBiZSBmaW5lLiBTaW5jZSB5b3Ugc2Vl bWVkIHRvIGhhdmUgYWdyZWVkIHRvCj4gYSBzb2x1dGlvbiB0aGF0IHdvdWxkIHNvbHZlIGFsbCB5 b3VyIGhlYWRhY2hlcyBJIGRpZG4ndCBib3RoZXIgZG9pbmcKPiBhbnkgY2hhbmdlcyBvbiBvdXIg c2lkZSBoZXJlLgoKU28gaWYgYSBjb21taXQgc2F5cyAiY2hlcnJ5LXBpY2siLCBJIGd1ZXNzIEkg Y2FuIGFsd2F5cyBhc3N1bWUgaXQncyBzYWZlCnRvIGFkZCwgcmlnaHQ/ICBJZiBub3QsIF90aGVu XyBJIGhhdmUgdG8gcnVuIHRoZSAic2VhcmNoIGJhY2t3YXJkcyIKbG9naWMsIHJpZ2h0PwoKT2ss IGxldCBtZSB0aGluayBhYm91dCB0aGlzIGEgYml0IHRvIHNlZSBpZiB0aGF0J3MgcG9zc2libGUg dG8gc2NyaXB0Li4uCgo+IHdoYXQgaGFwcGVuZWQ/IEhhcyBiYXNoaW5nIGRybSBiZWNvbWUgdGhl IGNvb2wgdGhpbmcgdG8gZG8gc29tZWhvdz8KCkkgZG9uJ3QgdW5kZXJzdGFuZCwgSSBoYXZlbid0 IGJhc2hlZCBkcm0gaW4geWVhcnMgOikKCnRoYW5rcywKCmdyZWcgImpldCBsYWdnZWQiIGstaApf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK