From patchwork Mon Jul 11 17:14:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1655033 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=l5iEjTFM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LhVsJ08ZRz9s07 for ; Tue, 12 Jul 2022 03:16:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D09058406A; Mon, 11 Jul 2022 19:15:09 +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="l5iEjTFM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E035684054; Mon, 11 Jul 2022 19:14:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 5E77384031 for ; Mon, 11 Jul 2022 19:14:48 +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-x72a.google.com with SMTP id p22so4343250qkj.4 for ; Mon, 11 Jul 2022 10:14:48 -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=pP4CmK/FLqNfrJBh0X8IlU4t2spxxMIXDaWGujg60vM=; b=l5iEjTFMLrmWrWRMehA5o4Z4ZcNzm1gC9/f3qOtCcb/BkaSoMvjX/0GBQ6xyMiy4Na Hk14UpBWZu9nyNsxNyXHUoPyZv+F74PDMIEqqbEM/EOUQ+L4yKmgCk+yoiDvov1H+KUG /a8E93yaCDFT1z/lBxT9p21hhx78yfG/M7kaY= 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=pP4CmK/FLqNfrJBh0X8IlU4t2spxxMIXDaWGujg60vM=; b=HZg0FDVKdf+nQ6RFyQNW51IxC+1mw4vURdHTtkm1ZhO/nogFc3jl2zdu89KqAXJu0b b/hbGpg3/AitIotH71bx+OafZBsncLhbcPx++fi5NtLNkUOOhs9ioWQZZq4Paf2O1YeH YSZaNEng5kDBT0MtBHtium3P6vSznBbT78MM4SkK4doHMhTCTuTJuG635a70BV7kQWj7 UPFzbygarqWHmMrxqayrg//6HrWX824BfNg299+OprMYU/XcTGn+Wr49Fa8C+NiKMPUd CXBf+4IoUT2IJTGwxDee2yiQf8zXegrCNpgdpchD0VzPGtG5a7D6Fpik21TaLre+mqWA AL4Q== X-Gm-Message-State: AJIora8T80VjiNqEa9mvXTw2O0Q4P1f99bRg5Ti+t6PgVQwSClCDqRrY Mo4zEMYHMS5co8tGn7WNQqS6j0Ao6XIj7Q== X-Google-Smtp-Source: AGRyM1syhe0NePkGxgYCg78sEk4brRylADar2FQo5OzrB3XAAErJCc/InujXBsvm6h0t+ouTLSKr4Q== X-Received: by 2002:a37:8d3:0:b0:6b5:8adf:208a with SMTP id 202-20020a3708d3000000b006b58adf208amr3348729qki.215.1657559686627; Mon, 11 Jul 2022 10:14:46 -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 bp20-20020a05622a1b9400b0031ea95094dcsm5519536qtb.72.2022.07.11.10.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 10:14:46 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Claudius Heine , Martin Bonner , Heinrich Schuchardt Subject: [PATCH 6/7] process.rst: Perform minor cleanups Date: Mon, 11 Jul 2022 13:14:38 -0400 Message-Id: <20220711171439.1657280-6-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220711171439.1657280-1-trini@konsulko.com> References: <20220711171439.1657280-1-trini@konsulko.com> MIME-Version: 1.0 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 - Use gender-neutral language to refer to the user, consistently. - Reword a few places so that they read more naturally. - Make the long standing practice around "Twilight Time" more clear, hopefully. - Replace a reference to MAKEALL with a reference to CI testing as that's the current requirement. Cc: Claudius Heine Cc: Martin Bonner Cc: Heinrich Schuchardt Signed-off-by: Tom Rini --- Changes in v2: - Further tweak the wording, per Martin --- doc/develop/process.rst | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/doc/develop/process.rst b/doc/develop/process.rst index 534da4a2a704..d0c46b58f3e9 100644 --- a/doc/develop/process.rst +++ b/doc/develop/process.rst @@ -46,21 +46,22 @@ Twilight Time ------------- Usually patches do not get accepted as they are - the peer review that takes -place will usually require changes and resubmits of the patches before they +place will usually require changes and resubmissions of the patches before they are considered to be ripe for inclusion into mainline. -Also, the review often happens not immediately after a patch was submitted, +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 +The result is that the final version of such patches gets submitted after the 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 -the closing of the Merge Window. +The result is that the release of the ``"-rc1"`` version and formal closing of +the Merge Window does not preclude patches that were already posted from being +merged for the upcoming release. Stabilization Period -------------------- @@ -75,13 +76,13 @@ Sometimes it is not clear if a patch contains a bug fix or not. For example, changes that remove dead code, unused macros etc. or that contain Coding Style fixes are not strict bug fixes. -In such situations it is up to the responsible custodian to decide if he -applies such patches even when the Merge Window is closed. +In such situations it is up to the responsible custodian to decide if they +apply such patches even when the Merge Window is closed. Exception: at the end of the Stabilization Period only strict bug fixes my be applied. -Sometimes patches miss the the Merge Window slightly - say by few +Sometimes patches miss the Merge Window slightly - say by a few hours or even a day. Patch acceptance is not as critical as a financial transaction, or such. So if there is such a slight delay, the custodian is free to turn a blind eye and accept it anyway. The @@ -110,7 +111,7 @@ Custodians ---------- The Custodians take responsibility for some area of the U-Boot code. The -in-tree ``MAINTAINERS`` files list who is reponsible for which areas. +in-tree ``MAINTAINERS`` files list who is responsible for which areas. It is their responsibility to pick up patches from the mailing list that fall into their responsibility, and to process these. @@ -155,7 +156,7 @@ like this: #. Applies cleanly to the source tree - #. passes a ``MAKEALL`` compile test without creating new warnings + #. Passes :doc:`ci_testing` as this checks for new warnings and other issues. #. Notes: @@ -167,7 +168,7 @@ like this: #. This is well documented in :doc:`designprinciples`. - #. The custodian decides himself how recent the code must be. It is + #. The custodian decides themselves how recent the code must be. It is acceptable to request patches against the last officially released version of U-Boot or newer. Of course a custodian can also accept patches against older code. @@ -177,7 +178,7 @@ like this: #. The custodian decides to accept or to reject the patch. -#. If accepted, the custodian adds the patch to his public git repository and +#. If accepted, the custodian adds the patch to their public git repository and notifies the mailing list. This note should include: * a short description of the changes @@ -186,15 +187,15 @@ like this: * suggested tests - Although the custodian is supposed to perform his own tests - it is a well-known and accepted fact that he needs help from + Although the custodian is supposed to perform their own tests + it is a well-known and accepted fact that they needs help from other developers who - for example - have access to the required hardware or tool chains. The custodian request help for tests and feedback from specific maintainers and U-Boot users. #. Once tests are passed, some agreed time limit expires, the custodian - requests that the changes in his public git repository be merged into the - main tree. If necessary, the custodian may have to adapt his changes to + requests that the changes in their public git repository be merged into the + main tree. If necessary, the custodian may have to adapt their changes to allow for a clean merge. Todo: define a reasonable time limit. 3 weeks?