* [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch
@ 2021-08-10 14:24 christian.ehrhardt
2021-08-10 14:24 ` [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected christian.ehrhardt
2021-08-10 16:57 ` [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch Luca Boccassi
0 siblings, 2 replies; 6+ messages in thread
From: christian.ehrhardt @ 2021-08-10 14:24 UTC (permalink / raw)
To: stable, Thomas Monjalon, Luca Boccassi, Xueming Li; +Cc: Christian Ehrhardt
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To select the proper maintainers - as of today - we recommend to check
out the main branch in $STABLE_DIR before calling 3-request-backport.
But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
and thereby does not find any applied patch.
Instead we should use $RTE_VER_MAJOR that will correctly select the
branch name and therefore make 3-request-backport work in this case.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
3-request-backport | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/3-request-backport b/3-request-backport
index a1725e5..67234d2 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -11,7 +11,7 @@ then
pushd $STABLE_DIR &>/dev/null
list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
_parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
- _applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\ -f2-)
+ _applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\ -f2-)
for _file in $list
do
_sub=$(grep Subject $_file | cut -d\ -f3-)
--
2.32.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected
2021-08-10 14:24 [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch christian.ehrhardt
@ 2021-08-10 14:24 ` christian.ehrhardt
2021-08-10 16:58 ` Luca Boccassi
2021-08-10 16:57 ` [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch Luca Boccassi
1 sibling, 1 reply; 6+ messages in thread
From: christian.ehrhardt @ 2021-08-10 14:24 UTC (permalink / raw)
To: stable, Thomas Monjalon, Luca Boccassi, Xueming Li; +Cc: Christian Ehrhardt
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
In the past we had a few "hey why did you try in the first place".
Since this is done based on the DPDK managed tool ./devtools/git-log-fixes.sh
discussions improvements and changes need to happen there and not on the
mail that that asks for backports.
Therefore mention the tool that selected the initial patch list in the
DPDK LTS process to guide everyone there as needed.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
3-request-backport | 1 +
1 file changed, 1 insertion(+)
diff --git a/3-request-backport b/3-request-backport
index 67234d2..eafd31e 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -58,6 +58,7 @@ cat << EOF
Hi commit authors (and maintainers),
+Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
I didn't apply following commits from DPDK main to $stable_branch
$(stable_or_lts) branch, as conflicts or build errors occur.
--
2.32.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch
2021-08-10 14:24 [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch christian.ehrhardt
2021-08-10 14:24 ` [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected christian.ehrhardt
@ 2021-08-10 16:57 ` Luca Boccassi
2021-08-11 6:38 ` Christian Ehrhardt
1 sibling, 1 reply; 6+ messages in thread
From: Luca Boccassi @ 2021-08-10 16:57 UTC (permalink / raw)
To: christian.ehrhardt, stable, Thomas Monjalon, Xueming Li
On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
>
> To select the proper maintainers - as of today - we recommend to check
> out the main branch in $STABLE_DIR before calling 3-request-backport.
> But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
> and thereby does not find any applied patch.
>
> Instead we should use $RTE_VER_MAJOR that will correctly select the
> branch name and therefore make 3-request-backport work in this case.
>
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
> 3-request-backport | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/3-request-backport b/3-request-backport
> index a1725e5..67234d2 100755
> --- a/3-request-backport
> +++ b/3-request-backport
> @@ -11,7 +11,7 @@ then
> pushd $STABLE_DIR &>/dev/null
> list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
> _parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
> - _applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\ -f2-)
> + _applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\ -f2-)
> for _file in $list
> do
> _sub=$(grep Subject $_file | cut -d\ -f3-)
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected
2021-08-10 14:24 ` [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected christian.ehrhardt
@ 2021-08-10 16:58 ` Luca Boccassi
2021-08-11 6:38 ` Christian Ehrhardt
0 siblings, 1 reply; 6+ messages in thread
From: Luca Boccassi @ 2021-08-10 16:58 UTC (permalink / raw)
To: christian.ehrhardt, stable, Thomas Monjalon, Xueming Li
On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
wrote:
> From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
>
> In the past we had a few "hey why did you try in the first place".
> Since this is done based on the DPDK managed tool ./devtools/git-log-fixes.sh
> discussions improvements and changes need to happen there and not on the
> mail that that asks for backports.
> Therefore mention the tool that selected the initial patch list in the
> DPDK LTS process to guide everyone there as needed.
>
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
> 3-request-backport | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/3-request-backport b/3-request-backport
> index 67234d2..eafd31e 100755
> --- a/3-request-backport
> +++ b/3-request-backport
> @@ -58,6 +58,7 @@ cat << EOF
>
> Hi commit authors (and maintainers),
>
> +Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> I didn't apply following commits from DPDK main to $stable_branch
> $(stable_or_lts) branch, as conflicts or build errors occur.
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected
2021-08-10 16:58 ` Luca Boccassi
@ 2021-08-11 6:38 ` Christian Ehrhardt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ehrhardt @ 2021-08-11 6:38 UTC (permalink / raw)
To: Luca Boccassi; +Cc: dpdk stable, Thomas Monjalon, Xueming Li
On Tue, Aug 10, 2021 at 6:58 PM Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
> wrote:
> > From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> >
> > In the past we had a few "hey why did you try in the first place".
> > Since this is done based on the DPDK managed tool ./devtools/git-log-fixes.sh
> > discussions improvements and changes need to happen there and not on the
> > mail that that asks for backports.
> > Therefore mention the tool that selected the initial patch list in the
> > DPDK LTS process to guide everyone there as needed.
> >
> > Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> > ---
> > 3-request-backport | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/3-request-backport b/3-request-backport
> > index 67234d2..eafd31e 100755
> > --- a/3-request-backport
> > +++ b/3-request-backport
> > @@ -58,6 +58,7 @@ cat << EOF
> >
> > Hi commit authors (and maintainers),
> >
> > +Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh
> > I didn't apply following commits from DPDK main to $stable_branch
> > $(stable_or_lts) branch, as conflicts or build errors occur.
>
> Acked-by: Luca Boccassi <bluca@debian.org>
Thanks, applied now
> --
> Kind regards,
> Luca Boccassi
--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch
2021-08-10 16:57 ` [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch Luca Boccassi
@ 2021-08-11 6:38 ` Christian Ehrhardt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ehrhardt @ 2021-08-11 6:38 UTC (permalink / raw)
To: Luca Boccassi; +Cc: dpdk stable, Thomas Monjalon, Xueming Li
On Tue, Aug 10, 2021 at 6:57 PM Luca Boccassi <bluca@debian.org> wrote:
>
> On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com
> wrote:
> > From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> >
> > To select the proper maintainers - as of today - we recommend to check
> > out the main branch in $STABLE_DIR before calling 3-request-backport.
> > But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD
> > and thereby does not find any applied patch.
> >
> > Instead we should use $RTE_VER_MAJOR that will correctly select the
> > branch name and therefore make 3-request-backport work in this case.
> >
> > Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> > ---
> > 3-request-backport | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/3-request-backport b/3-request-backport
> > index a1725e5..67234d2 100755
> > --- a/3-request-backport
> > +++ b/3-request-backport
> > @@ -11,7 +11,7 @@ then
> > pushd $STABLE_DIR &>/dev/null
> > list=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ')
> > _parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id)
> > - _applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\ -f2-)
> > + _applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\ -f2-)
> > for _file in $list
> > do
> > _sub=$(grep Subject $_file | cut -d\ -f3-)
>
> Acked-by: Luca Boccassi <bluca@debian.org>
Thanks, applied now
> --
> Kind regards,
> Luca Boccassi
--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-11 6:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-10 14:24 [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch christian.ehrhardt
2021-08-10 14:24 ` [dpdk-stable] [PATCH 2/2] 3-request-backport: explain why patches are selected christian.ehrhardt
2021-08-10 16:58 ` Luca Boccassi
2021-08-11 6:38 ` Christian Ehrhardt
2021-08-10 16:57 ` [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch Luca Boccassi
2021-08-11 6:38 ` Christian Ehrhardt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).