09/10/2020 10:11, yang_y_yi:
> Thomas, sorry for quick reply, update for 
> doc/guides/rel_notes/release_20_11.rst also has been there, so please ignore 
> this one merge request.
> 
> I'm totally confused. The version Jiayu acked is v7, here are diffstat of v7 
> I sent, I'm not sure why these documents are updated by previous two merges. 
> I also interdiff two merged patches and local these two patches, diff only 
> has document changes, this is really very weird, what happened?

Listen, after several emails about this, I am a bit bored that you
don't double check before asking the same question again.
Look at the mail I sent to you originally:
        http://mails.dpdk.org/archives/dev/2020-October/184701.html*
"Applied with release notes changes integrated in the right commits"
Then I explained again:
"It has been squashed with the related code change as it should be."

It means I did what you were supposed to do:
merging the documentation updates in the commits which are doing
the code changes. So the changes are atomic with the doc,
which helps when digging in the git history.

You can see the result by yourself:
        http://git.dpdk.org/dpdk/commit/?id=1ca5e674
        http://git.dpdk.org/dpdk/commit/?id=e2d81106

While we are at it, please reply kindly to Olivier who is trying
to understand your issue with mbuf. You keep saying it is his fault
without giving the evidence he is asking for.
In short: please pay more attention to what the maintainers are saying.

Thank you


PS: please do not top-post


> diffstat 0001-gro-add-UDP-IPv4-GRO-support.patch
>  gro_udp4.c  |  433 
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  gro_udp4.h  |  281 ++++++++++++++++++++++++++++++++++++++
>  meson.build |    2
>  rte_gro.c   |   94 ++++++++++---
>  rte_gro.h   |    5
>  5 files changed, 798 insertions(+), 17 deletions(-)
> 
> diffstat 0002-gro-add-VXLAN-UDP-IPv4-GRO-support.patch
>  gro_udp4.h       |    1
>  gro_vxlan_udp4.c |  545 
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  gro_vxlan_udp4.h |  153 +++++++++++++++
>  meson.build      |    2
>  rte_gro.c        |  115 ++++++++---
>  rte_gro.h        |    3
>  6 files changed, 792 insertions(+), 27 deletions(-)
> 
> $ grep "\.rst" 0001-gro-add-UDP-IPv4-GRO-support.patch
> 
> $ grep "\.rst" 0002-gro-add-VXLAN-UDP-IPv4-GRO-support.patch
> 
> 
> At 2020-10-09 15:47:49, "yang_y_yi" <yang_y...@163.com> wrote:
> >Thomas, sorry for confusion, previous two merges did include changes against 
> >doc/guides/prog_guide/generic_receive_offload_lib.rst, but
> >doc/guides/rel_notes/release_20_11.rst isn't updated yet, so I posted 
> >https://patches.dpdk.org/patch/80105/ to update it, please help merge  
> >https://patches.dpdk.org/patch/80105/, thanks a lot.
> >At 2020-10-09 14:48:19, "Thomas Monjalon" <tho...@monjalon.net> wrote:
> >>09/10/2020 08:34, yang_y_yi:
> >>> Thomas, only this one of this series hasn't yet been merged, maybe you 
> >>> missed it, also please help merge it, thanks a lot.
> >>
> >>No I did not miss it.
> >>It has been squashed with the related code change as it should be.
> >>Please double check.
> >>
> >>[...]
> >>> >>  doc/guides/prog_guide/generic_receive_offload_lib.rst | 6 +++---
> >>> >>  doc/guides/rel_notes/release_20_11.rst                | 6 ++++++
> >>> >>  2 files changed, 9 insertions(+), 3 deletions(-)



Reply via email to