From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 113ADA04AC for ; Tue, 1 Sep 2020 12:12:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 017E4DE0; Tue, 1 Sep 2020 12:12:50 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id F3FBADE0 for ; Tue, 1 Sep 2020 12:12:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598955167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=McphwavIhtaZs1AlG7UWUgppalTXtcpBU7/rvHy/hoE=; b=Imw5sW9IIDq5nwCHiGliFY0DZSVhqRRf6Of/N97uNF24NgfTshXNX2UAC7hbabszHas8oB YJEfINuuE08C53iULle25YE7K7MRNqVf8xAvrwZa9VOYfo1k9yvfcS0t1AMUs4JsfN+gj7 0GQX6uCiw8UNUBSgdRMv8rXNJ0H3TgA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-55-EzuUDq25Mb2wxEE52KzNKw-1; Tue, 01 Sep 2020 06:12:45 -0400 X-MC-Unique: EzuUDq25Mb2wxEE52KzNKw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9FEDE1888A2F; Tue, 1 Sep 2020 10:12:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A4BE5C1A3; Tue, 1 Sep 2020 10:12:43 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: bluca@debian.org, Kevin Traynor Date: Tue, 1 Sep 2020 11:12:39 +0100 Message-Id: <20200901101239.73322-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH stable-scripts] Update to new DPDK branch names X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" DPDK branch names in the dpdk.git repo have been updated. Update email text and README to reflect the change. Signed-off-by: Kevin Traynor --- 3-request-backport | 6 +++--- README | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3-request-backport b/3-request-backport index dadaf3e..5749e26 100755 --- a/3-request-backport +++ b/3-request-backport @@ -53,5 +53,5 @@ cat << EOF Hi commit authors (and maintainers), -I didn't apply following commits from DPDK master to $stable_branch +I didn't apply following commits from DPDK main to $stable_branch $(stable_or_lts) branch, as conflicts or build errors occur. @@ -65,7 +65,7 @@ Please do either of the above by $(date --date="+7 days" "+%D"). Some notes on $(stable_or_lts) backports: -A backport should contain a reference to the DPDK master branch commit +A backport should contain a reference to the DPDK main branch commit in it's commit message in the following fashion: - [ upstream commit ] + [ upstream commit ] For example: diff --git a/README b/README index fdf61ab..3e4978a 100644 --- a/README +++ b/README @@ -81,5 +81,5 @@ This will create .patch files located in stable-scripts//mail which can then be sent with git send-email to the authors and stable@dpdk.org. -As part of this email a diff is provided between the master and stable branch +As part of this email a diff is provided between the main and stable branch patches. As there are diffs in the patches and diffs between the patches, it can be hard to see how the patch will look in the repo when there are rebase -- 2.26.2