Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0DABC433EF for ; Tue, 12 Jul 2022 21:34:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27BBA841E6; Tue, 12 Jul 2022 23:34:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="T6dua8FP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3B813840D2; Tue, 12 Jul 2022 23:34:28 +0200 (CEST) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2FB02841D3 for ; Tue, 12 Jul 2022 23:34:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x834.google.com with SMTP id i21so9198580qtw.12 for ; Tue, 12 Jul 2022 14:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oSiTZCWG3R0bhd3WeS+d9Irdyk7E+mUbRwD5vpny3BM=; b=T6dua8FPjOjlg/jHgQI7uWTzH7LS5WsUY9pJANyChs5D8efLAQAs0t9wzKUqj9/uf6 M71iLerJcOeQhONVCaNBKwttqZMEkgxWoU0fBn9ABMuhSifuDVCHTkgiY+Q59leJ0mCf fWz/osvaG1dGJTeylPCJGJ+Ex7yu+WkgP2Ujk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oSiTZCWG3R0bhd3WeS+d9Irdyk7E+mUbRwD5vpny3BM=; b=SycFyp1LwhFBFhqO9ZfjFG1WXE1a4vuZuU/OECmCL85PTnQs4fAEtxE7Uvu18ZKB0Z FrIsCqjZIxLc0ta88S9BVydsoptrxOHL3j26GchrL2v2Mgxd/KbWBHbku5XJQfx4HoEm pGkvWjxcI5nU3pG8GGw01mJEswUCA6DxQCOBfLoOp8pIYKrmYlTHcaT1AFjIPTqGcLJD qsa7u+wqYf2xo9jWTukUHNQVCDvUKIROy1H+os0cr9O78iHU+MBELzEZW6BBed5MAKgf Dzhym+1u5PjnCfBaujI/nDh4niCA3GxM+BLzj3RcaWaBUl3OjLTdYFeqa6eWLRrYbohx m/Mw== X-Gm-Message-State: AJIora+nsTGeZ/rO0b80WMbzti/t63X1NW5ug8PIrC/mozTD4o+brS2l o9FXnvwBHSgNau+H7weU4SJs87weUzfCHA== X-Google-Smtp-Source: AGRyM1vh4C/W4R1LYfas+K+x/qWZoyjBbwvBmx22S5sZ0EgWIJdJG/mH3y8GO1oTWGtR20/8fcSIfw== X-Received: by 2002:a05:622a:1651:b0:31d:3113:b87d with SMTP id y17-20020a05622a165100b0031d3113b87dmr6105qtj.631.1657661660580; Tue, 12 Jul 2022 14:34:20 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id x18-20020a05620a449200b006a981a2c483sm10995476qkp.39.2022.07.12.14.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 14:34:20 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Heinrich Schuchardt Subject: [v3 3/4] doc: process: Correct and expand slightly on the Merge Window concept Date: Tue, 12 Jul 2022 17:34:15 -0400 Message-Id: <20220712213416.3200979-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712213416.3200979-1-trini@konsulko.com> References: <20220712213416.3200979-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean For quite a long time we've been using a 3 week, rather than 2 week, merge window as it was only 2 weeks during the timeframe where we did 2 month rather than 3 month releases. This corrects the places that still had 2 weeks and tries to make things a bit clearer overall. Cc: Heinrich Schuchardt Signed-off-by: Tom Rini --- Changes in v3: - New patch suggested by Heinrich --- doc/develop/process.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/develop/process.rst b/doc/develop/process.rst index 56c9d274be71..f9b4201068a0 100644 --- a/doc/develop/process.rst +++ b/doc/develop/process.rst @@ -8,8 +8,8 @@ Management Summary * Development happens in Release Cycles of 3 months. -* The first 2 weeks are called Merge Window, which is followed by a - Stabilization Period. +* The first 3 weeks of the cycle are referred to as the Merge Window, which is + followed by a Stabilization Period. * Patches with new code get only accepted while the Merge Window is open. @@ -27,7 +27,7 @@ U-Boot development takes place in `Release Cycles `_. A Release Cycle lasts normally for three months. -The first two weeks of each Release Cycle are called *Merge Window*. +The first three weeks of each Release Cycle are called *Merge Window*. It is followed by a *Stabilization Period*. @@ -36,8 +36,9 @@ The end of a Release Cycle is marked by the release of a new U-Boot version. Merge Window ------------ -The Merge Window is the period when new patches get submitted -(and hopefully accepted) for inclusion into U-Boot mainline. +The Merge Window is the period when new patches get submitted (and hopefully +accepted) for inclusion into U-Boot mainline. This period lasts for 21 days (3 +weeks) and ends with the release of ``"-rc1"``. This is the only time when new code (like support for new processors or new boards, or other new features or reorganization of code) is accepted. -- 2.25.1