Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/101208 _apply patch failure_ Submitter: Gregory Etelson Date: Tuesday, October 12 2021 12:29:34 Applied on: CommitID:e0ae3db0c043cbdc4cc22bb60206f21ec4a82a02 Apply patch set 101208 failed: Checking patch app/test/test_flow_classify.c... Checking patch doc/guides/rel_notes/deprecation.rst... error: while searching for: * net: ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. * net: The structure ``rte_ipv4_hdr`` will have two unions. The first union is for existing ``version_ihl`` byte and new bitfield for version and IHL. The second union is for existing ``fragment_offset`` and new bitfield for fragment flags and offset. * vhost: ``rte_vdpa_register_device``, ``rte_vdpa_unregister_device``, ``rte_vhost_host_notifier_ctrl`` and ``rte_vdpa_relay_vring_used`` vDPA driver interface will be marked as internal in DPDK v21.11. error: patch failed: doc/guides/rel_notes/deprecation.rst:167 Checking patch doc/guides/rel_notes/release_21_11.rst... Hunk #1 succeeded at 208 (offset 21 lines). Checking patch lib/net/rte_ip.h... Hunk #1 succeeded at 39 (offset 1 line). Applied patch app/test/test_flow_classify.c cleanly. Applying patch doc/guides/rel_notes/deprecation.rst with 1 reject... Rejected hunk #1. Applied patch doc/guides/rel_notes/release_21_11.rst cleanly. Applied patch lib/net/rte_ip.h cleanly. diff a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst (rejected hunks) @@ -167,12 +167,6 @@ Deprecation Notices * net: ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. -* net: The structure ``rte_ipv4_hdr`` will have two unions. - The first union is for existing ``version_ihl`` byte - and new bitfield for version and IHL. - The second union is for existing ``fragment_offset`` - and new bitfield for fragment flags and offset. - * vhost: ``rte_vdpa_register_device``, ``rte_vdpa_unregister_device``, ``rte_vhost_host_notifier_ctrl`` and ``rte_vdpa_relay_vring_used`` vDPA driver interface will be marked as internal in DPDK v21.11. https://lab.dpdk.org/results/dashboard/patchsets/19335/ UNH-IOL DPDK Community Lab