From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: The i915 stable patch marking is totally broken Date: Thu, 16 Mar 2017 16:40:01 +0200 Message-ID: <878to5cmke.fsf@intel.com> References: <20170312194440.GA32007@kroah.com> <20170312204621.vzvmzgnuio2fqmr7@phenom.ffwll.local> <20170312220121.GB30510@kroah.com> <20170316073830.23jcxeff4wyurgak@phenom.ffwll.local> <20170316140231.GA1076@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4EA26E32A for ; Thu, 16 Mar 2017 14:40:03 +0000 (UTC) In-Reply-To: <20170316140231.GA1076@kroah.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Greg KH , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , stable List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAxNiBNYXIgMjAxNywgR3JlZyBLSCA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+ IHdyb3RlOgo+IEFuZCBhZ2FpbiwgeW91IGFsbCBhcmUgdGhlIG9ubHkgb25lcyB0aGF0IGhhdmUg dGhpcyBpc3N1ZS4gIFlvdSBtaWdodAo+IGZpbmQgYSBoYW5kZnVsbCBvZiBwYXRjaGVzIGZvciBz dGFibGUgdGhhdCBjb21lIGluIHR3aWNlIGluIHRoZSByZXN0IG9mCj4gdGhlIGtlcm5lbCwgYnV0 IHlvdXIgImxpdHRsZSIgZHJpdmVyIGR3YXJmcyB0aGF0IGJ5IGFuIG9yZGVyIG9mCj4gbWFnbml0 dWRlLiAgSSByZWFsbHkgdGhpbmsgeW91IGFyZSBkb2luZyBpdCB3cm9uZywgbm8gb25lIGVsc2Ug c2VlbXMgdG8KPiBoYXZlIHRoaXMgaXNzdWUuLi4KCkp1c3QgcGVyaGFwcyB3ZSBoYXZlIHJlYWxs eSBhY3RpdmUgZGV2ZWxvcG1lbnQgd2l0aCBsb3RzIG9mIGRpbGlnZW5jZSBpbgp0YWdnaW5nIGZp eGVzIHdpdGggRml4ZXM6IGFuZCBDYzogc3RhYmxlLCBhbmQgbm90IHNvIG1hbnkgb3RoZXJzIGRv PwoKPiBJJ2xsIGJlIGJhY2sgaG9tZSBuZXh0IHdlZWsgYW5kIGxvb2sgaW50byB3cml0aW5nIHNv bWUgc2NyaXB0cyBmb3IgdGhpcywKPiBidXQgcGxlYXNlIGNvbnNpZGVyIGp1c3Qgc3dpdGNoaW5n IHlvdXIgIndoaWNoIGJyYW5jaCBkb2VzIGl0IGdvIGludG8KPiBmaXJzdCIgbW9kZWwsIHdoaWNo IHdvdWxkIHJlYWxseSBzYXZlIG1lIGEgdG9uIG9mIHRpbWUsIGFuZCByZW1vdmUKPiBjb25mdXNp b24gZnJvbSBhbnlvbmUgd2hvIGV2ZXIgcnVucyBhY3Jvc3Mgb25lIG9mIHRoZXNlIGNoZXJyeS1w aWNrCj4gbWVzc2FnZXMuCgpVc3VhbGx5IG91ciBkZXZlbG9wbWVudCBicmFuY2hlcyBhcmUgbW9u dGhzIGFoZWFkIG9mIHdoYXQncyBjdXJyZW50bHkKaGFwcGVuaW5nIGluIExpbnVzJyBtYXN0ZXIu IFdlIGFscmVhZHkgaGF2ZSB0b25zIG9mIHN0dWZmIHJlYWR5IGZvcgp2NC4xMiwgYW5kIGF0IGFy b3VuZCB2NC4xMS1yYzUgd2Ugc3RhcnQgYWltaW5nIGF0IHY0LjEzLiBUaGlzIGlzIHdoYXQKZXZl cnlvbmUgd2FudHMgdXMgdG8gZG8sIGJlIHJlYWR5IGVhcmxpZXIgYW5kIGVhcmxpZXIgZm9yIHRo ZSBtZXJnZQp3aW5kb3dzLgoKSXQgaXMgKm11Y2gqIGVhc2llciBmb3IgdXMgdG8gZ3JpbmQgdGhl IGZpeGVzIHRocm91Z2ggb3VyIENJIGFuZCBRQSBvbgpvdXIgZGV2ZWxvcG1lbnQgYnJhbmNoZXMs IG1ha2Ugc3VyZSB0aGUgZml4ZXMgYXJlIGdvb2QgYW5kIGNvbXBhdGlibGUKd2l0aCB3aGF0J3Mg Y29taW5nIGFoZWFkLCBhbmQgdGhhdCB0aGUgaXNzdWVzIHN0YXkgZml4ZWQuIFdoZW4gd2UgbWVy Z2UKTGludXMnIG1hc3RlciBhbmQgb3VyIC1uZXh0LCB3ZSBjYW4gYWx3YXlzIHRyaXZpYWxseSBy ZXNvbHZlIHRoZQpjb25mbGljdCB0byB3aGF0J3MgaW4gb3VyIC1uZXh0LCBhbmQgdGhlIGZpeGVz IGFyZSBub3QgbG9zdC4gQW5kIGlmIHdlCmZpbmQgaXNzdWVzIHdpdGggdGhlIGNvbW1pdHMsIHdl IGNhbiBjaG9vc2UgdG8gbm90IGNoZXJyeS1waWNrIHRoZW0KdW50aWwgdGhleSdyZSBmaXhlZC4K CkluIHRoZSBwYXN0LCB3ZSBkaWQgaGF2ZSBsb3RzIG9mIHRyb3VibGUgd2l0aCBwZW9wbGUgZml4 aW5nIGlzc3VlcyBpbgpvdXIgZGV2ZWxvcG1lbnQgYnJhbmNoZXMgKGJlY2F1c2UgdGhhdCdzIHdo YXQgeW91IGRldmVsb3Agb24pLCBhbmQgdGhlCmZpeGVzIHdvdWxkIG5vdCBhcHBseSB0byBMaW51 cycgbWFzdGVyLiBXZSdkIHJlZG8gdGhlIHBhdGNoLCBhbmQgZW5kIHVwCndpdGggbmFzdHkgY29u ZmxpY3RzIHdpdGggd2hhdCdzIGluIC1uZXh0LiBXZSBlbmRlZCB1cCBzdGFsbGluZyBvbiBmaXhl cwppbiAqYm90aCogYnJhbmNoZXMuIEkgdGhpbmsgd2UgZGlkIGEgbXVjaCB3b3JzZSBqb2IgZ2V0 dGluZyB0aGluZ3MgZG9uZQp3aXRoIHRoZSByZXZlcnNlIG9yZGVyIG9mIGFwcGx5aW5nIGZpeGVz LCBiZWNhdXNlIGl0IHdhcyBzbyBtdWNoIGhhcmRlcgpmb3IgdXMuCgpJbiB0aGUgZW5kLCB0aGUg bW9kZWwgaXMgbm90IHVubGlrZSB0aGUgc3RhYmxlIHdvcmtmbG93LiBJdCdzIGp1c3QgdGhhdApz dGFibGUgZG9lc24ndCBtZXJnZSBiYWNrIHdpdGggTGludXMnIG1hc3Rlci4KCkJSLApKYW5pLgoK Ci0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754148AbdCPOqn (ORCPT ); Thu, 16 Mar 2017 10:46:43 -0400 Received: from mga01.intel.com ([192.55.52.88]:40953 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754129AbdCPOql (ORCPT ); Thu, 16 Mar 2017 10:46:41 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,172,1486454400"; d="scan'208";a="835502090" From: Jani Nikula To: Greg KH , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , stable Subject: Re: [Intel-gfx] The i915 stable patch marking is totally broken In-Reply-To: <20170316140231.GA1076@kroah.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20170312194440.GA32007@kroah.com> <20170312204621.vzvmzgnuio2fqmr7@phenom.ffwll.local> <20170312220121.GB30510@kroah.com> <20170316073830.23jcxeff4wyurgak@phenom.ffwll.local> <20170316140231.GA1076@kroah.com> Date: Thu, 16 Mar 2017 16:40:01 +0200 Message-ID: <878to5cmke.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 16 Mar 2017, Greg KH wrote: > 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... Just perhaps we have really active development with lots of diligence in tagging fixes with Fixes: and Cc: stable, and not so many others do? > 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. Usually our development branches are months ahead of what's currently happening in Linus' master. We already have tons of stuff ready for v4.12, and at around v4.11-rc5 we start aiming at v4.13. This is what everyone wants us to do, be ready earlier and earlier for the merge windows. It is *much* easier for us to grind the fixes through our CI and QA on our development branches, make sure the fixes are good and compatible with what's coming ahead, and that the issues stay fixed. When we merge Linus' master and our -next, we can always trivially resolve the conflict to what's in our -next, and the fixes are not lost. And if we find issues with the commits, we can choose to not cherry-pick them until they're fixed. In the past, we did have lots of trouble with people fixing issues in our development branches (because that's what you develop on), and the fixes would not apply to Linus' master. We'd redo the patch, and end up with nasty conflicts with what's in -next. We ended up stalling on fixes in *both* branches. I think we did a much worse job getting things done with the reverse order of applying fixes, because it was so much harder for us. In the end, the model is not unlike the stable workflow. It's just that stable doesn't merge back with Linus' master. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center