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 F1209C43334 for ; Fri, 8 Jul 2022 18:39:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA032845B0; Fri, 8 Jul 2022 20:38:51 +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="hsizulmj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 08572845B0; Fri, 8 Jul 2022 20:38:50 +0200 (CEST) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 E97B7845AD for ; Fri, 8 Jul 2022 20:38:45 +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-x72d.google.com with SMTP id z12so16409700qki.3 for ; Fri, 08 Jul 2022 11:38:45 -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=7gI3dS980FbkQfZONsfKTUdgogDMMkAYYMoBtbHvRBI=; b=hsizulmjdJFlQLn309wUQ4rNYUIEaeNYc2E1PjL3pYlFAn6mScPtnkTKUrNrup+9Ul RPbSi4J9lnS8viV+oIvIgn32Jrf48EyY6pRpr5EKWp+mog1VFv4ixOYug3shz3THMuHl A48lUfR/aeL+sGtICE08gw9dkZLdD5TjjjXh0= 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=7gI3dS980FbkQfZONsfKTUdgogDMMkAYYMoBtbHvRBI=; b=UF6TPZQebjLTKQqYBQ8xLOli1FWaJ12kQyu4diCbNSCOJ9e8Z1eah5nnORY/jhuJ6C RVoDvikqEOIkf/87apszVaZgiQS85trKe/wCioDWrutj9KdQ2ErVEytbP6GEa/DaBnKd vBkn/lqRJJvZXADZys7qUaGrajr3PummoJ0K89bRtyzYUy8t9lo5zcrg4renk5nHQe6I G4IE2LbO3YwFpNFxsyV3blPbpVQYvrAUtFAnG6mn1ZJz5SUoPtDLaFNtK2v77IrdBcwz IDFA1qtp1F29GYHw0gzcXbDuVNb5t5e+fuIzYcgwpIdNjJG3MAmVzModq8oqh1hx+nD7 9iXw== X-Gm-Message-State: AJIora/mEuIRg8cJz9lLNj4YVPKflLO7YdYb8ZvKEp9RLQWzUTMP3NsA ptv6tOtMwLz/8U0mEGGdA/5168+7rDHMnA== X-Google-Smtp-Source: AGRyM1shp4IJ8cbx0I4j/ICJ6kI8PrRrU2c9VdGbsob0UbBBX0XTeIy6aMqSu2b7ird5JuJCF8uMyQ== X-Received: by 2002:a05:620a:4449:b0:6b2:83d3:2e13 with SMTP id w9-20020a05620a444900b006b283d32e13mr3594491qkp.658.1657305524177; Fri, 08 Jul 2022 11:38:44 -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 t15-20020ac865cf000000b0031aaf05420fsm23395821qto.57.2022.07.08.11.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 11:38:43 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Claudius Heine , Martin Bonner Subject: [PATCH 2/2] process.rst: Perform minor cleanups Date: Fri, 8 Jul 2022 14:38:41 -0400 Message-Id: <20220708183841.1604929-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220708183841.1604929-1-trini@konsulko.com> References: <20220708183841.1604929-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 - 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 Signed-off-by: Tom Rini --- doc/develop/process.rst | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/develop/process.rst b/doc/develop/process.rst index dd279fb9eff1..8f471fd161b2 100644 --- a/doc/develop/process.rst +++ b/doc/develop/process.rst @@ -42,21 +42,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, 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 -------------------- @@ -71,13 +72,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 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 @@ -105,7 +106,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. @@ -144,7 +145,7 @@ like this: #. U-Boot Philosophy #. 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: @@ -153,7 +154,7 @@ like this: patch should send a short ACK to the mailing list. #. We should create some tool to automatically do 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. @@ -161,22 +162,22 @@ like this: sign off/ack lines. 5. 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 * the list of the affected boards / architectures etc. * 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? -- 2.25.1