Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752280AbdCMKlw (ORCPT ); Mon, 13 Mar 2017 06:41:52 -0400 Received: from mga01.intel.com ([192.55.52.88]:53891 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbdCMKln (ORCPT ); Mon, 13 Mar 2017 06:41:43 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,158,1486454400"; d="scan'208";a="833951743" From: Jani Nikula To: Daniel Vetter , Greg KH Cc: Daniel Vetter , intel-gfx , Linux Kernel Mailing List , stable Subject: Re: [Intel-gfx] The i915 stable patch marking is totally broken In-Reply-To: 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> Date: Mon, 13 Mar 2017 12:41:39 +0200 Message-ID: <87a88pfogs.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 Content-Length: 1668 Lines: 36 On Mon, 13 Mar 2017, Daniel Vetter wrote: > Our cherry-pick sha1 work exactly like yours: They don't make sense > when you only look at the tree a patch has been cherry-picked _to_, > since they're the sha1 from the tree they've been cherry-picked > _from_. When you clone a fresh copy of your stable tree then the > cherry-pick numbers also point nowhere. Only once you've pulled the > future tree they're from (Linus' git in your case) do they make sense. > > Same for our cherry-picks, except the future tree isn't Linus' git > (we'd have managed to make sha1 collisions cheaply otherwise ...) but > the future Linus' git tree. Which is maintained by Stephen Rothwell in > linux-next. As soon as you make sure you have the latest > linux-next.git they will all resolve to something meaningful. Indeed, if there's a cherry-pick reference to a commit that's *not* in linux-next, we deserve to be yelled at. The branches that feed to linux-next that we cherry-pick from are non-rebasing, so the commit ids should not change when they eventually hit Linus' tree. >> 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... Most of our cherry-picking is scripted, so if there's further annotation that you'd like, just let us know. (Too bad it's virtually impossible to modify the commit being cherry-picked. Unless someone(tm) comes up with a way to share git-notes in a sensible, distributed way.) BR, Jani. -- Jani Nikula, Intel Open Source Technology Center