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 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 F067CC43334 for ; Fri, 8 Jul 2022 17:45:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A044384583; Fri, 8 Jul 2022 19:45:07 +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="EDEnBuyu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8409484595; Fri, 8 Jul 2022 19:45:06 +0200 (CEST) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 2521F84576 for ; Fri, 8 Jul 2022 19:45:03 +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-qk1-x735.google.com with SMTP id z16so16297563qkj.7 for ; Fri, 08 Jul 2022 10:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=9qN1Z2L8IKfkT7Sf/rP4vidkim2brJZu4n0LwOr6GbI=; b=EDEnBuyu/Y9Nl/l4fD4vEiQrYsA433V3NfUQG5JATV7JCVAw00PAuCdncxnISfMWZj tvyPhuQBsBjrIgiRmzUNfknW0PtM22Bgw2N3soKsVOyrXsGU06n87jKX70ZlyX+ebYmi YbaK4HP0fdpD0WRwaEnsQCH2Y2kPY1Lte8SHI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=9qN1Z2L8IKfkT7Sf/rP4vidkim2brJZu4n0LwOr6GbI=; b=DoS/5hi4H8xbyYjuvSQFElTVeziJr19lk936lyO4/Bq+hgjNcAgPZc6SBmv/2bhKWF MGbSK2Z+AYMMwF6XLf6BkUqOTbpZqr7gYZO2YvrmVec7N34ykyRU8o95tFOyZxdEKt4c KCLy3NZkrOqwaS6WQ80LNTG9YtczIAcm3G+bqs/gCirYwJo8A0RLneUjXX8cT9CiRCYV fhQVv46qtCgy2XgniH5jyetCy6qU/r4J+L+UvQxV7PEVSiClCs3jIl1I70OAmq76yvjC w+5/Bg1mxGZgtDUVgDNMN5NOVBqFItEUsIXdvgCiMZ0yOZ3TZ0B5N4s0odjhJznZINpe fglA== X-Gm-Message-State: AJIora+yN27uiDWmMSp5IvGxxLFNxbKE5v3KWgfEKEQeggo0zUPc87lb 7fPrfXMYyDldm+gdmJ15jYVHTQ== X-Google-Smtp-Source: AGRyM1shVAhHc9uXxxbTqO/eyd5n7MHmtySTJYUJiB4jgHMNJ2jq6Y+oWPAPhXCwdshj4JL1/wXTSg== X-Received: by 2002:a05:620a:4246:b0:6a8:b684:8518 with SMTP id w6-20020a05620a424600b006a8b6848518mr3136207qko.479.1657302301749; Fri, 08 Jul 2022 10:45:01 -0700 (PDT) Received: from bill-the-cat (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id k1-20020a05620a414100b006af039ff090sm38946225qko.97.2022.07.08.10.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 10:45:00 -0700 (PDT) Date: Fri, 8 Jul 2022 13:44:58 -0400 From: Tom Rini To: Martin Bonner Cc: Claudius Heine , u-boot@lists.denx.de Subject: Re: [PATCH 4/4] doc: Migrate Process wiki page to sphinx Message-ID: <20220708174458.GQ1146598@bill-the-cat> References: <20220627171722.1153337-1-trini@konsulko.com> <20220627171722.1153337-5-trini@konsulko.com> <7235181d-1379-c041-24cf-d350649337f5@denx.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DtLPZNwqBzCmn3P6" Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett 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 --DtLPZNwqBzCmn3P6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 08, 2022 at 08:22:12AM +0100, Martin Bonner wrote: > Martin >=20 >=20 > On Fri, 8 Jul 2022 at 08:06, Claudius Heine wrote: >=20 > > Hi Tom, > > > > On 2022-06-27 19:17, Tom Rini wrote: > > > Move the current Process wiki page to doc/develop/process.rst. The > > > changes here are for formatting or slight rewording so that it reads > > > well when linking to other sphinx documents. > > > > > > Signed-off-by: Tom Rini > > > --- > > > doc/develop/index.rst | 1 + > > > doc/develop/process.rst | 182 +++++++++++++++++++++++++++++++++++++= +++ > > > 2 files changed, 183 insertions(+) > > > create mode 100644 doc/develop/process.rst > > > > > > diff --git a/doc/develop/index.rst b/doc/develop/index.rst > > > index c0f4f0ba413a..eab00a55382a 100644 > > > --- a/doc/develop/index.rst > > > +++ b/doc/develop/index.rst > > > @@ -11,6 +11,7 @@ General > > > > > > codingstyle > > > designprinciples > > > + process > > > > > > Implementation > > > -------------- > > > diff --git a/doc/develop/process.rst b/doc/develop/process.rst > > > new file mode 100644 > > > index 000000000000..dd279fb9eff1 > > > --- /dev/null > > > +++ b/doc/develop/process.rst > > > @@ -0,0 +1,182 @@ > > > +.. SPDX-License-Identifier: GPL-2.0+: > > > + > > > +U-Boot Development Process > > > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > + > > > +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. > > > +* Patches with new code get only accepted while the Merge Window is > > open. > > > +* A patch that is generally in good shape and that was submitted whi= le > > the > > > + Merge Window was open is eligible to go into the upcoming release, > > even if > > > + changes and resubmits are needed. > > > +* During the Stabilization Period, only patches that contain bug fix= es > > get > > > + applied. > > > + > > > +Phases of the Development Process > > > +--------------------------------- > > > + > > > +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*. > > > + > > > +It is followed by a *Stabilization Period*. > > > + > > > +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. > > > + > > > +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. > > > + > > > +Twilight Time > > > +------------- > > > + > > > +Usually patches do not get accepted as they are - the peer review th= at > > takes > > > +place will usually require changes and resubmits of the patches befo= re > > they > > > +are considered to be ripe for inclusion into mainline. > > > + > > > +Also, the review often happens not immediately after a patch was > > submitted, > > > +but only when somebody (usually the responsible custodian) finds time > > to do > > > +this. > > > + > > > +In the result, the final version of such patches gets submitted after > > the > > > Should be: "The result is that the final version..." or "This can mean the > final version..." >=20 >=20 > > > +merge window has been closed. > > > + > > > +It is current practice in U-Boot that such patches are eligible to go > > into the > > > +upcoming release. > > > + > > > +In the result, the release of the ``"-rc1"`` version does not > > immediately follow > > > Should be "The result is that the release..." or "Thus the release..." >=20 > The first of both my two choices is closer to the original wording, the > second feels to me (as a British English speaker) to be more idiomatic. > (Beware, idiomatic English is not necessarily good - not everyone here is= a > native speaker, and it can be overly complex.) Thanks for the feedback. I suspect that Wolfgang wrote these pages initially. I'll cc you both on patches to adjust the wording slightly. I'm doing the read-aloud test on these sections now. --=20 Tom --DtLPZNwqBzCmn3P6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmLIbRcACgkQFHw5/5Y0 tyw+qgwAjX5puQy086NMSJztHuLBdqgwWMoDXbCwhSWQZ7vpz5s9EptlLy8Ul/8O N0J4h26n7OKGnfz6qPfkmISS1gi0dhp9vLso6QUjrjKb1LJC9/G4q6W6XXTZkLJP UOASMKYwoOmE1j+kwpWBME2Er4TiidHkOGt22JzZUCz7fyiUN1DYXwS27r1eltXT OThJlcVelBhl8PsbSAHnR/dG8tI3/+r02Ec+NdX4yjGjVwMhMLqFsUylfK1VPaS6 uM4So4BIZRBebOsx+TFgC33SD3kF/v6Knf9XZlM5RVfi1d8feUoC/khgNsXISvFT fMQvFnSOK7too5Gins7OIvE77R2nAWumFD11nBZaDbPI2BrEGBTu6mpNkbSNJsay KlxEgoWSBUAq6/DrZOsbFQnxv/K6LKbzTtAw5wtfeARmt8xCGB981OtNPGfVC13Z OFn+QCu126OGABryc8jje9esyG9hiI3v2jM1DgTdk+AuZ090Kgq1m7OCw6tKsIoH 6ZTm8fOs =AeBV -----END PGP SIGNATURE----- --DtLPZNwqBzCmn3P6--