On Tue, Oct 13, 2020 at 12:39 AM Pavan Nikhilesh Bhagavatula <pbhagavat...@marvell.com> wrote: > > >> Subject: [PATCH v2 2/2] eventdev: update app and examples for new > >eventdev ABI > >> > >> Several data structures and constants changed, or were added, > >> in the previous patch. This commit updates the dependent > >> apps and examples to use the new ABI. > >> > >> Signed-off-by: Timothy McDaniel <timothy.mcdan...@intel.com> > > With fixes to trace framework > Acked-by: Pavan Nikhilesh <pbhagavat...@marvell.com>
@McDaniel, Timothy , The series has apply issues[1], Could you send the final version with Ack of Harry and Pavan. I will merge this series for RC1 and Let's move DLB PMD driver updates to RC2. [1] [for-main]dell[dpdk-next-eventdev] $ date && /home/jerin/config/scripts/build_each_patch.sh /tmp/r/ && date Wed Oct 14 12:41:19 AM IST 2020 HEAD is now at b7a8eea2c app/eventdev: enable fast free offload meson build test Applying: eventdev: eventdev: express DLB/DLB2 PMD constraints Using index info to reconstruct a base tree... M drivers/event/dpaa2/dpaa2_eventdev.c M drivers/event/octeontx/ssovf_evdev.c M drivers/event/octeontx2/otx2_evdev.c M lib/librte_eventdev/rte_event_eth_tx_adapter.c M lib/librte_eventdev/rte_eventdev.c Falling back to patching base and 3-way merge... Auto-merging lib/librte_eventdev/rte_eventdev.c CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev.c Auto-merging lib/librte_eventdev/rte_event_eth_tx_adapter.c Auto-merging drivers/event/octeontx2/otx2_evdev.c Auto-merging drivers/event/octeontx/ssovf_evdev.c Auto-merging drivers/event/dpaa2/dpaa2_eventdev.c Recorded preimage for 'lib/librte_eventdev/rte_eventdev.c' error: Failed to merge in the changes. Patch failed at 0001 eventdev: eventdev: express DLB/DLB2 PMD constraints hint: Use 'git am --show-current-patch=diff' 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". git am failed /tmp/r//v2-1-2-eventdev-eventdev-express-DLB-DLB2-PMD-constraints HEAD is now at b7a8eea2c app/eventdev: enable fast free offload Wed Oct 14 12:41:19 AM IST 2020
