From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 9A69B2A5E; Tue, 21 Feb 2017 13:02:56 +0100 (CET) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 04:02:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,189,1484035200"; d="scan'208";a="227887132" Received: from sivswdev01.ir.intel.com (HELO localhost.localdomain) ([10.237.217.45]) by fmsmga004.fm.intel.com with ESMTP; 21 Feb 2017 04:02:54 -0800 From: Bruce Richardson To: techboard@dpdk.org Cc: dev@dpdk.org, Bruce Richardson Date: Tue, 21 Feb 2017 12:02:47 +0000 Message-Id: <1487678567-13375-1-git-send-email-bruce.richardson@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] doc: add details on requirements for patch ack and merge X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 12:02:57 -0000 Add to the contributors guide the requirements and guidelines for getting patches acked and merged. It details at what point the review comments and the ack's need to be received in order to have a given patch merged into a release. These guidelines are as agreed by the DPDK technical board at the meeting held on 2017-02-15. Signed-off-by: Bruce Richardson --- doc/guides/contributing/patches.rst | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 4fe9025..a0f91a3 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -504,4 +504,20 @@ patch accepted. The general cycle for patch review and acceptance is: #. In addition a patch will not be accepted if it doesn't address comments from a previous version with fixes or valid arguments. -#. Acked patches will be merged in the current or next merge window. +#. It is the responsibility of a maintainer to ensure that patches are reviewed and to provide an ``ack`` or + ``nack`` of those patches as appropriate. + +#. Once a patch has been acked by the relevant maintainer, reviewers may still comment on it for a further + two weeks. After that time, the patch should be merged into the relevent git tree for the next release. + Additional notes and restrictions: + + * patches should be acked by a maintainer at least two days before the release merge + deadline, in order to make that release. + * for patches acked with less than two weeks to go to the merge deadline, all additional + comments should be made no later than two days before the merge deadline. + * after the appropriate time for additional feedback has passed, if the patch has not yet + been merged to the relevant tree by the committer, it should be treated as though it had, + in that any additional changes needed to it must be addressed by a follow-on patch, rather + than rework of the original. + * trivial patches may be merged sooner than described above at the tree committer's + discretion. -- 2.9.3