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 542CCA04AC for ; Tue, 1 Sep 2020 13:32:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F58C1515; Tue, 1 Sep 2020 13:32:22 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 63D8D1515 for ; Tue, 1 Sep 2020 13:32:21 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id m6so1140985wrn.0 for ; Tue, 01 Sep 2020 04:32:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=+1j8PqqFw77ve2he4GuzP6PPF3P9+k3CKG9pDUEiXdY=; b=cEC3ZLzvw+1jOvVwUi3JaTrEBwbrmIHoRlzOBUn0eqybSlCLtncfRoFrskfZzCKF8F y3FVC+EaadX/PhCQpqx6+Fu404mbe1NEgwy08Sfg4Iu+pes4m2HqGVC4vJx/YRf0g6QQ zJL8XSd9hIdJYQ+18DBfIZ4qCQkETeLR+6I2PKZdXJOMmEfWgfNC7Dop7HBEpNMwYWQF rfqo+JjYLajH1HN95EpZw4w30M1F433ODz5k6F1k+qU6z7fUBH3Ic8M8YPiIR/6TOnrF QPLRR69ni5Bran7o4I/fDQvZnOFfyWpa+TF2aE8zRlc8JwRwXdEISTo5yf0V+HLJL/RZ ViTg== X-Gm-Message-State: AOAM532PT7r9RuPBZHp68tWKvoS3EuldNmmmUjcrBrkhpzkor5JbUuhY IVJUzzZrJpYNxwIAqgfmgHU= X-Google-Smtp-Source: ABdhPJxj4vEPcS4doyr4RE9kjTf3EmZjYDYYTOqe6yRuBEpNt2NGN3x1MRjiK8qDxZlRc7a/G3gVfw== X-Received: by 2002:a5d:5404:: with SMTP id g4mr1353986wrv.134.1598959941054; Tue, 01 Sep 2020 04:32:21 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d11sm1893986wrw.77.2020.09.01.04.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 04:32:20 -0700 (PDT) Message-ID: <04a4ea2e70689f2775f8210a994ee8348a544c1b.camel@debian.org> From: Luca Boccassi To: Kevin Traynor , stable@dpdk.org Date: Tue, 01 Sep 2020 12:32:19 +0100 In-Reply-To: <20200901101239.73322-1-ktraynor@redhat.com> References: <20200901101239.73322-1-ktraynor@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [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" On Tue, 2020-09-01 at 11:12 +0100, Kevin Traynor wrote: > DPDK branch names in the dpdk.git repo have been updated. > Update email text and README to reflect the change. >=20 > Signed-off-by: Kevin Traynor > --- > 3-request-backport | 6 +++--- > README | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) >=20 > 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), > =20 > -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. > =20 > @@ -65,7 +65,7 @@ Please do either of the above by $(date --date=3D"+7 da= ys" "+%D"). > Some notes on $(stable_or_lts) backports: > =20 > -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 ] > =20 > 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. > =20 > -As part of this email a diff is provided between the master and stable b= ranch > +As part of this email a diff is provided between the main and stable bra= nch > 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 re= base Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi