[dpdk-test-report] |FAILURE| pw(86665) doc: update release notes for txgbe

[dpdk-test-report] |FAILURE| pw(86665) doc: update release notes for txgbe

[sys_stv]

[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]


Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/86665

_apply issues_

Submitter: Jiawen Wu <jiawenwu@trustnetic.com>
Date: 2021-01-15 11:03:10
Reply_mail: 20210115110310.1838171-1-jiawenwu@trustnetic.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 75253e43a1642f31ba0ef44ebb69cdf5aeb92305
	Repo:dpdk, CommitID: 324242fb510b65644f025a996404abcd0b8199a6


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_21_02.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_21_02.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: update release notes for txgbe
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

* Repo: dpdk
In some situations, we would get several ip fragments, which total
    data length is less than min_ip_len(64) and padding with zeros.
    We simulated intermediate fragments by modifying the MTU.
    To illustrate the problem, we simplify the packet format and
    ignore the impact of the packet header.In namespace2,
    a packet whose data length is 1520 is sent.
    When the packet passes tap2, the packet is divided into two
--
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_21_02.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_21_02.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: update release notes for txgbe
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
DPDK STV team