06/10/2017 04:15, Ferruh Yigit: > On 9/29/2017 8:17 AM, Zhiyong Yang wrote: > > Zhiyong Yang (5): > > net/bonding: remove bonding APIs using ABI versioning > > ethdev: increase port_id range > > examples: increase port_id range > > test: increase port_id range > > librte_mbuf: modify port initialization value > > Series applied to dpdk-next-net/master, thanks. > > There was merge conflict for: > rte_eth_bond_pmd.c > failsafe_private.h > mlx5_rxtx.h > > Maintainers of these files cc'ed, can you please double check latest > files in next-net?
I have re-done the merge of this series in master because it was wrong for mlx5, as notified by Nelio.
