From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38FF6C3A59F for ; Mon, 26 Aug 2019 13:33:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1112B21852 for ; Mon, 26 Aug 2019 13:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566826395; bh=FamM+SSY+z3f75Xpd6SmuYGyZVxeXjQ1tjsE5A1mK0g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=M50ghQlwz1gCjPdUAlYGrX/rv8QUD8+zmxddsMAxmxMp9sKC6x5ymON7nt25o7FGK L8+kt8LYfB8qJXiti0Qv7gUvKLdcb6/wHblMR+HTx01w4PnmR5m9cPJv0A/KI/+37n 7PKJS9wX4FJn/xWR4SbjMZ+pThBGqDOF+VcbLRSE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730631AbfHZNdO (ORCPT ); Mon, 26 Aug 2019 09:33:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:35562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbfHZNdO (ORCPT ); Mon, 26 Aug 2019 09:33:14 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E3AA2053B; Mon, 26 Aug 2019 13:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566826393; bh=FamM+SSY+z3f75Xpd6SmuYGyZVxeXjQ1tjsE5A1mK0g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=zWA/lYMRUhnZGc4MqKv/RxuOQdMUMesgrfB3TXIWqEiB5QkEsOlIBnv5Lyhp3+ZW/ A/zqoZtDA9d6RN1APSiHrx1UjeqaX28mvUb7EAsA/kIzdb2hMeN+/ggBDln4eWKIl1 tYh4Wz2GLdgO8TRqK0cF0G5f/H8OpXA3lME4kKss= Date: Mon, 26 Aug 2019 09:33:12 -0400 From: Sasha Levin To: Nikolai Kondrashov Cc: Greg KH , CKI Project , Linux Stable maillist Subject: Re: =?utf-8?B?4p2MIEZBSUw=?= =?utf-8?Q?=3A?= Stable queue: queue-5.2 Message-ID: <20190826133312.GI5281@sasha-vm> References: <20190825144122.GA27775@kroah.com> <20190826083309.GA32549@kroah.com> <1e9a3221-f044-a3a0-bbe1-34e6f8a468f0@redhat.com> <8badf977-5af5-d5cb-82d1-61f3596f7ec8@redhat.com> <53508fd1-cb2d-12e1-3d6e-12d2272efc09@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <53508fd1-cb2d-12e1-3d6e-12d2272efc09@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Aug 26, 2019 at 02:39:31PM +0300, Nikolai Kondrashov wrote: >So, this leads me to suspect the repos *were* inconsistent. Likely not as I >described before, but still. They should've been inconsistent for more than 5 >minutes for us to trip on this. This is likely the case. I took my sweet time doing the release and looking at irc logs, I have gone way above 5 minutes. However, we'd really like to avoid having a magical number of minutes here to get it right. To me the issue seems that you're mixing the information provided by two repos that may have inconsistency between them, even if merely due to sync within the CDN. You should use information provided only by one repo. I myself run a (rather dumb) bot that just attempts to apply/build -stable tagged patches, and it seems to avoid the inconsistency issue by only working with the information provided by stable-queue: - For each of the active stable/LTS kernels (let's say 5.2 in this "loop"), we do: - Grab the latest released version from stable-queue: - $ git tag | sort -V | grep 'v5\.2' | tail -n1 v5.2.10 - Check it out in linux-stable: - $ git checkout v5.2.10 - Bail if the above fails; this solves the "consistency" problem. - Apply the patches from the queue - Run your tests This way, you guarantee that linux-stable is at the right position since you're just telling it where to go to, rather than getting information out of that repo which might conflict with something you've learned from stable-queue. -- Thanks, Sasha