Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/100442 _apply patch failure_ Submitter: Maxime Coquelin Date: Monday, October 04 2021 14:30:17 Applied on: CommitID:086d426406bd3f6fac96a15bbd871c7fe714bc2d Apply patch set 100442-100446 failed: Checking patch doc/guides/nics/features/virtio.ini... Checking patch doc/guides/nics/virtio.rst... Checking patch doc/guides/rel_notes/release_21_11.rst... Hunk #1 succeeded at 125 (offset -4 lines). Checking patch drivers/net/virtio/virtio.h... error: while searching for: rte_spinlock_t state_lock; struct rte_mbuf **inject_pkts; uint16_t max_queue_pairs; uint64_t req_guest_features; struct virtnet_ctl *cvq; bool use_va; error: patch failed: drivers/net/virtio/virtio.h:190 Checking patch drivers/net/virtio/virtio_ethdev.c... Hunk #4 succeeded at 753 (offset -13 lines). Hunk #5 succeeded at 793 (offset -13 lines). Hunk #6 succeeded at 1034 (offset -13 lines). Hunk #7 succeeded at 1781 (offset -13 lines). Hunk #8 succeeded at 2153 (offset -13 lines). Hunk #9 succeeded at 2193 (offset -13 lines). Hunk #10 succeeded at 2441 (offset -13 lines). Hunk #11 succeeded at 2461 (offset -13 lines). Hunk #12 succeeded at 2498 (offset -13 lines). Hunk #13 succeeded at 2870 (offset -44 lines). Hunk #14 succeeded at 2911 (offset -44 lines). Checking patch drivers/net/virtio/virtio_ethdev.h... Checking patch drivers/net/virtio/virtqueue.h... Hunk #1 succeeded at 182 (offset -19 lines). Hunk #2 succeeded at 290 (offset -20 lines). Applied patch doc/guides/nics/features/virtio.ini cleanly. Applied patch doc/guides/nics/virtio.rst cleanly. Applied patch doc/guides/rel_notes/release_21_11.rst cleanly. Applying patch drivers/net/virtio/virtio.h with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Applied patch drivers/net/virtio/virtio_ethdev.c cleanly. Applied patch drivers/net/virtio/virtio_ethdev.h cleanly. Applied patch drivers/net/virtio/virtqueue.h cleanly. diff a/drivers/net/virtio/virtio.h b/drivers/net/virtio/virtio.h (rejected hunks) @@ -190,6 +216,9 @@ struct virtio_hw { rte_spinlock_t state_lock; struct rte_mbuf **inject_pkts; uint16_t max_queue_pairs; + uint32_t rss_hash_types; + uint16_t *rss_reta; + uint8_t *rss_key; uint64_t req_guest_features; struct virtnet_ctl *cvq; bool use_va; https://lab.dpdk.org/results/dashboard/patchsets/19154/ UNH-IOL DPDK Community Lab