From patchwork Wed Aug 12 09:29:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 75457 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71CE9A04C2; Wed, 12 Aug 2020 11:29:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A2F6C1C10B; Wed, 12 Aug 2020 11:29:57 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id ABB861C0DB for ; Wed, 12 Aug 2020 11:29:56 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 478495C0085; Wed, 12 Aug 2020 05:29:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 12 Aug 2020 05:29:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm1; bh=M3CG9kPr5S4C6z6hf5NSTfpRmK Ce5Zv1/dhTOzZSvlI=; b=kAb56Rzd5b5soJzyUJZH+tsvLdpIOV5JRlknM5mL3B cGqiDYOq+ZHNlxUr/GAxEp6f1VMm4UOqMpeBOAtmFTIZA6kbj0MvQQ7tuOCTJu0n ZRuBebQB+Y4mK/oM9JinLTLNanSrcykbl/37t+0iTsQlPVHQPtkgb/uldm2UdO1M 3M1cdxY1wBgMI6432i9T0ILa3qIaAMA5YDIrEkgZRYNmLAg8t4L0MMRg7nfyCERR 522ZrDBBvnJMHDfRQCrEhuJZiDA2got8Nwyhxt+hLE1UEHbnqCeiTwB4GC3HgdDJ FnAU+BhcON57hRZbnY2uxiLVjDWQ3fVVayMSfCxJi7vQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=M3CG9k Pr5S4C6z6hf5NSTfpRmKCe5Zv1/dhTOzZSvlI=; b=kkHaKKSt/1SKppLe00USIb 30hasH7+NZr59w2r+jXxwePWrzfVwxFnIc+Gkawv7oXw/zf7WIVwjYSekaxj8COX meZJ+RJUNPED5F1naZMfRfUVLm5crm7J5rAMhxGFZ6U5GpxXEAT8QFS0pBlWpk9q YkGn3VYbWpMSTFQjbVCHRQhSHuXZYEkAanUi07PnoLJw3BY5dRqF5s0i+tcry+sJ mwg1bbz7zOqcl7GUs51lcDBpTju+m5tBF/2QBv5/SHI1nyjKFulJV5k0pGQPBkxt 7lE3YQk5eopqOlk0EHuYGt24JO4j+7MMBs+QLbNgFdRLeF5S4//Ys0o3T41FMNBQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrledvgddujecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefvhhhomhgrshcu ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf grthhtvghrnhepjeeiudekteejjeejjeejteevfedujeethfegfeekjeefvdetudegieeu feefvdefnecuffhomhgrihhnpeguphgukhdrohhrghenucfkphepleefrdeirddugeelrd duudegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep thhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (114.149.6.93.rev.sfr.net [93.6.149.114]) by mail.messagingengine.com (Postfix) with ESMTPA id D45BC3280063; Wed, 12 Aug 2020 05:29:54 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, stephen@networkplumber.org, John McNamara , Marko Kovacevic Date: Wed, 12 Aug 2020 11:29:15 +0200 Message-Id: <20200812092915.2325511-1-thomas@monjalon.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] switch default git branch name to main 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The default git branch of the main DPDK repository has been renamed from master to main. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- devtools/check-git-log.sh | 4 ++-- devtools/checkpatches.sh | 4 ++-- doc/guides/contributing/patches.rst | 5 +++-- doc/guides/contributing/stable.rst | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh index 08fea5d9b7..9988bf863d 100755 --- a/devtools/check-git-log.sh +++ b/devtools/check-git-log.sh @@ -16,7 +16,7 @@ print_usage () { by latest git commits limited with -n option, or commits in the git range specified with -r option. e.g. To check only the last commit, ‘-n1’ or ‘-r@~..’ is used. - If no range provided, default is origin/master..HEAD. + If no range provided, default is origin/main..HEAD. END_OF_HELP } @@ -27,7 +27,7 @@ selfdir=$(dirname $(readlink -f $0)) # and allows for specifying the patches to check by passing -nX or -r range. # The old format allows for specifying patches by passing -X or range # as the first argument. -range=${1:-origin/master..} +range=${1:-origin/main..} if [ "$range" = '--help' ] ; then print_usage diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index b5191df08f..78a408ef98 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -45,7 +45,7 @@ print_usage () { The patches to check can be from stdin, files specified on the command line, latest git commits limited with -n option, or commits in the git range - specified with -r option (default: "origin/master.."). + specified with -r option (default: "origin/main.."). END_OF_HELP } @@ -200,7 +200,7 @@ check_internal_tags() { # } number=0 -range='origin/master..' +range='origin/main..' quiet=false verbose=false while getopts hn:qr:v ARG ; do diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index de493a901d..425bb874f8 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -118,7 +118,8 @@ The proposer should justify the need for a new sub-tree and should have demonstr The maintainer should be confirmed by an ``ack`` from an existing tree maintainer. Disagreements on trees or maintainers can be brought to the Technical Board. -The backup maintainer for the master tree should be selected from the existing sub-tree maintainers from the project. +The backup maintainer for the main tree should be selected +from the existing sub-tree maintainers of the project. The backup maintainer for a sub-tree should be selected from among the component maintainers within that sub-tree. @@ -319,7 +320,7 @@ For example:: Patch for Stable Releases ~~~~~~~~~~~~~~~~~~~~~~~~~ -All fix patches to the master branch that are candidates for backporting +All fix patches to the main branch that are candidates for backporting should also be CCed to the `stable@dpdk.org `_ mailing list. In the commit message body the Cc: stable@dpdk.org should be inserted as follows:: diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst index 890bbeccc3..75e71951b1 100644 --- a/doc/guides/contributing/stable.rst +++ b/doc/guides/contributing/stable.rst @@ -28,7 +28,7 @@ Stable Releases Any release of DPDK can be designated as a Stable Release if a maintainer volunteers to maintain it and there is a commitment from major contributors to validate it before releases. If a release is to be designated -as a Stable Release, it should be done by 1 month after the master release. +as a Stable Release, it should be done by 1 month after the main release. A Stable Release is used to backport fixes from an ``N`` release back to an ``N-1`` release, for example, from 16.11 to 16.07. @@ -72,7 +72,7 @@ point the LTS branch will no longer be maintained with no further releases. What changes should be backported --------------------------------- -Backporting should be limited to bug fixes. All patches accepted on the master +Backporting should be limited to bug fixes. All patches accepted on the main branch with a Fixes: tag should be backported to the relevant stable/LTS branches, unless the submitter indicates otherwise. If there are exceptions, they will be discussed on the mailing lists. @@ -107,7 +107,7 @@ The Stable Mailing List The Stable and LTS release are coordinated on the stable@dpdk.org mailing list. -All fix patches to the master branch that are candidates for backporting +All fix patches to the main branch that are candidates for backporting should also be CCed to the `stable@dpdk.org `_ mailing list.