[dpdk-stable] [PATCH stable-scripts] Update to new DPDK branch names

[Kevin Traynor]

On 01/09/2020 12:32, Luca Boccassi wrote:
> 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.
>>
>> Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
>> ---
>>  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 <commit's dpdk master branch SHA-1 checksum> ]
>> +    [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
>>  
>>  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/<release>/mail which can
>>  then be sent with git send-email to the authors and stable at 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
> 
> Acked-by: Luca Boccassi <bluca at debian.org>
> 

Thanks Luca, Applied.