From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134AbdDLM6J (ORCPT ); Wed, 12 Apr 2017 08:58:09 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:57002 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbdDLM6H (ORCPT ); Wed, 12 Apr 2017 08:58:07 -0400 Date: Wed, 12 Apr 2017 14:57:56 +0200 From: Greg KH To: Daniel Vetter Cc: Dave Airlie , Daniel Vetter , "intel-gfx@lists.freedesktop.org" , stable , LKML Subject: Re: [Intel-gfx] The i915 stable patch marking is totally broken Message-ID: <20170412125756.GA2515@kroah.com> References: <20170312194440.GA32007@kroah.com> <20170312215215.GA30510@kroah.com> <20170412124855.GA22799@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170412124855.GA22799@kroah.com> 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 Wed, Apr 12, 2017 at 02:48:55PM +0200, Greg KH wrote: > On Mon, Mar 13, 2017 at 07:49:59AM +0100, Daniel Vetter wrote: > > On Sun, Mar 12, 2017 at 10:52 PM, Greg KH wrote: > > > Why don't the maintainers know which tree to put them in when they are > > > submitted? As an example, if I get a patch that needs to go to Linus, I > > > put it in my usb-linus branch, and when it hits a -rc release, I then > > > merge that -rc back into my usb-next branch. So I end up with about 2-3 > > > merges to -rc every release, which isn't bad and doesn't cause any > > > duplication issues. > > > > > > Seems that most other subsystems also do this as well. > > > > We do know (mostly) where a patch should go to, and we do push a > > backmerge every 1-2 weeks or so, too. > > > > The reason why we've started to require that every bugfix for drm/i915 > > land in -next first is fairly similar to why you insist every bugfix > > must be in Linus' tree: Without that patches get lost. Well, they > > don't get lost intentionally (they're all still in the git log for us > > due to backmerges), but we did lose some in the horrible resulting > > conflicts. Insisting that we have them in our -next branch means the > > backmerges can be resolved with git merge -x ours. > > > > And in the end this is how it's done byalmost everyone: You push to > > master and cherry-pick over to stable/release branches. Most projects > > don't apply bugfixes to the stable branch and then backmerge to their > > master branch, because it would result in pure chaos. You don't do > > that either for stable kernel. It's just that for most subsystems the > > resulting conflict gallore of using backmerges is fairly manageable > > (it's getting into the no-fun territory with drm core too, but still > > ok), whereas drm/i915 is just too much, moving too fast, to make that > > a working model. > > Ok, I agree that your code is moving too fast for the "normal" stable > model here. I just tried to apply a potential 17 patches and only 8 > applied. That's not a good percentage. Ok, the last remaining ones (all 6) in my queue, did apply cleanly, so your percentage went up a bit more, but it's still the worst of any part of the kernel and I don't think this is working as-is. greg 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: Wed, 12 Apr 2017 14:57:56 +0200 Message-ID: <20170412125756.GA2515@kroah.com> References: <20170312194440.GA32007@kroah.com> <20170312215215.GA30510@kroah.com> <20170412124855.GA22799@kroah.com> 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 9ECDA6E20C for ; Wed, 12 Apr 2017 12:58:06 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170412124855.GA22799@kroah.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Daniel Vetter , "intel-gfx@lists.freedesktop.org" , LKML , stable List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBBcHIgMTIsIDIwMTcgYXQgMDI6NDg6NTVQTSArMDIwMCwgR3JlZyBLSCB3cm90ZToK PiBPbiBNb24sIE1hciAxMywgMjAxNyBhdCAwNzo0OTo1OUFNICswMTAwLCBEYW5pZWwgVmV0dGVy IHdyb3RlOgo+ID4gT24gU3VuLCBNYXIgMTIsIDIwMTcgYXQgMTA6NTIgUE0sIEdyZWcgS0ggPGdy ZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPiB3cm90ZToKPiA+ID4gV2h5IGRvbid0IHRoZSBtYWlu dGFpbmVycyBrbm93IHdoaWNoIHRyZWUgdG8gcHV0IHRoZW0gaW4gd2hlbiB0aGV5IGFyZQo+ID4g PiBzdWJtaXR0ZWQ/ICBBcyBhbiBleGFtcGxlLCBpZiBJIGdldCBhIHBhdGNoIHRoYXQgbmVlZHMg dG8gZ28gdG8gTGludXMsIEkKPiA+ID4gcHV0IGl0IGluIG15IHVzYi1saW51cyBicmFuY2gsIGFu ZCB3aGVuIGl0IGhpdHMgYSAtcmMgcmVsZWFzZSwgSSB0aGVuCj4gPiA+IG1lcmdlIHRoYXQgLXJj IGJhY2sgaW50byBteSB1c2ItbmV4dCBicmFuY2guICBTbyBJIGVuZCB1cCB3aXRoIGFib3V0IDIt Mwo+ID4gPiBtZXJnZXMgdG8gLXJjIGV2ZXJ5IHJlbGVhc2UsIHdoaWNoIGlzbid0IGJhZCBhbmQg ZG9lc24ndCBjYXVzZSBhbnkKPiA+ID4gZHVwbGljYXRpb24gaXNzdWVzLgo+ID4gPgo+ID4gPiBT ZWVtcyB0aGF0IG1vc3Qgb3RoZXIgc3Vic3lzdGVtcyBhbHNvIGRvIHRoaXMgYXMgd2VsbC4KPiA+ IAo+ID4gV2UgZG8ga25vdyAobW9zdGx5KSB3aGVyZSBhIHBhdGNoIHNob3VsZCBnbyB0bywgYW5k IHdlIGRvIHB1c2ggYQo+ID4gYmFja21lcmdlIGV2ZXJ5IDEtMiB3ZWVrcyBvciBzbywgdG9vLgo+ ID4gCj4gPiBUaGUgcmVhc29uIHdoeSB3ZSd2ZSBzdGFydGVkIHRvIHJlcXVpcmUgdGhhdCBldmVy eSBidWdmaXggZm9yIGRybS9pOTE1Cj4gPiBsYW5kIGluIC1uZXh0IGZpcnN0IGlzIGZhaXJseSBz aW1pbGFyIHRvIHdoeSB5b3UgaW5zaXN0IGV2ZXJ5IGJ1Z2ZpeAo+ID4gbXVzdCBiZSBpbiBMaW51 cycgdHJlZTogV2l0aG91dCB0aGF0IHBhdGNoZXMgZ2V0IGxvc3QuIFdlbGwsIHRoZXkKPiA+IGRv bid0IGdldCBsb3N0IGludGVudGlvbmFsbHkgKHRoZXkncmUgYWxsIHN0aWxsIGluIHRoZSBnaXQg bG9nIGZvciB1cwo+ID4gZHVlIHRvIGJhY2ttZXJnZXMpLCBidXQgd2UgZGlkIGxvc2Ugc29tZSBp biB0aGUgaG9ycmlibGUgcmVzdWx0aW5nCj4gPiBjb25mbGljdHMuIEluc2lzdGluZyB0aGF0IHdl IGhhdmUgdGhlbSBpbiBvdXIgLW5leHQgYnJhbmNoIG1lYW5zIHRoZQo+ID4gYmFja21lcmdlcyBj YW4gYmUgcmVzb2x2ZWQgd2l0aCBnaXQgbWVyZ2UgLXggb3Vycy4KPiA+IAo+ID4gQW5kIGluIHRo ZSBlbmQgdGhpcyBpcyBob3cgaXQncyBkb25lIGJ5YWxtb3N0IGV2ZXJ5b25lOiBZb3UgcHVzaCB0 bwo+ID4gbWFzdGVyIGFuZCBjaGVycnktcGljayBvdmVyIHRvIHN0YWJsZS9yZWxlYXNlIGJyYW5j aGVzLiBNb3N0IHByb2plY3RzCj4gPiBkb24ndCBhcHBseSBidWdmaXhlcyB0byB0aGUgc3RhYmxl IGJyYW5jaCBhbmQgdGhlbiBiYWNrbWVyZ2UgdG8gdGhlaXIKPiA+IG1hc3RlciBicmFuY2gsIGJl Y2F1c2UgaXQgd291bGQgcmVzdWx0IGluIHB1cmUgY2hhb3MuIFlvdSBkb24ndCBkbwo+ID4gdGhh dCBlaXRoZXIgZm9yIHN0YWJsZSBrZXJuZWwuIEl0J3MganVzdCB0aGF0IGZvciBtb3N0IHN1YnN5 c3RlbXMgdGhlCj4gPiByZXN1bHRpbmcgY29uZmxpY3QgZ2FsbG9yZSBvZiB1c2luZyBiYWNrbWVy Z2VzIGlzIGZhaXJseSBtYW5hZ2VhYmxlCj4gPiAoaXQncyBnZXR0aW5nIGludG8gdGhlIG5vLWZ1 biB0ZXJyaXRvcnkgd2l0aCBkcm0gY29yZSB0b28sIGJ1dCBzdGlsbAo+ID4gb2spLCB3aGVyZWFz IGRybS9pOTE1IGlzIGp1c3QgdG9vIG11Y2gsIG1vdmluZyB0b28gZmFzdCwgdG8gbWFrZSB0aGF0 Cj4gPiBhIHdvcmtpbmcgbW9kZWwuCj4gCj4gT2ssIEkgYWdyZWUgdGhhdCB5b3VyIGNvZGUgaXMg bW92aW5nIHRvbyBmYXN0IGZvciB0aGUgIm5vcm1hbCIgc3RhYmxlCj4gbW9kZWwgaGVyZS4gIEkg anVzdCB0cmllZCB0byBhcHBseSBhIHBvdGVudGlhbCAxNyBwYXRjaGVzIGFuZCBvbmx5IDgKPiBh cHBsaWVkLiAgVGhhdCdzIG5vdCBhIGdvb2QgcGVyY2VudGFnZS4KCk9rLCB0aGUgbGFzdCByZW1h aW5pbmcgb25lcyAoYWxsIDYpIGluIG15IHF1ZXVlLCBkaWQgYXBwbHkgY2xlYW5seSwgc28KeW91 ciBwZXJjZW50YWdlIHdlbnQgdXAgYSBiaXQgbW9yZSwgYnV0IGl0J3Mgc3RpbGwgdGhlIHdvcnN0 IG9mIGFueSBwYXJ0Cm9mIHRoZSBrZXJuZWwgYW5kIEkgZG9uJ3QgdGhpbmsgdGhpcyBpcyB3b3Jr aW5nIGFzLWlzLgoKZ3JlZyBrLWgKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==