On 9/6/2019 3:07 PM, Aaron Conole wrote: > Andrew Rybchenko <arybche...@solarflare.com> writes: > >> On 9/6/19 4:29 PM, Aaron Conole wrote: >>> Andrew Rybchenko <arybche...@solarflare.com> writes: >>> >>>> From: Ivan Ilchenko <ivan.ilche...@oktetlabs.ru> >>>> >>>> Change eth_dev_infos_get_t return value from void to int. >>>> Make eth_dev_infos_get_t implementations across all drivers to return >>>> negative errno values if case of error conditions. >>>> >>>> Signed-off-by: Ivan Ilchenko <ivan.ilche...@oktetlabs.ru> >>>> Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com> >>>> --- >>> This patch needs a respin. >>> >>> ../drivers/net/atlantic/atl_ethdev.c >>> ../drivers/net/atlantic/atl_ethdev.c:123:12: error: conflicting types >>> for ‘atl_dev_info_get’ >>> static int atl_dev_info_get(struct rte_eth_dev *dev, >>> ^ >>> ../drivers/net/atlantic/atl_ethdev.c:48:13: note: previous declaration >>> of ‘atl_dev_info_get’ was here >>> static void atl_dev_info_get(struct rte_eth_dev *dev, >>> >>> Looks like the function prototype appears twice in the .c file - I >>> suggest removing one of them. >> >> It is already done: >> http://git.dpdk.org/next/dpdk-next-net/commit/?id=2c9202612408baf748609d3ee4e49cc183e0366c > > Ahh okay. > > I wonder if it's possible to get this patch on mainline?
There is a planned early merge end of this week, so it will be in mainline soon. > > Strange that it went through -next since it's really a fix. > Not really :) The '-next' name is not used as same as Linux trees and it is confusing people. The 'next-X' sub-trees are *not* for the next release, they are sub-trees for specific subsystem and merged to main repo regularly during a release cycyle and gets both fixes and features only for this release. We don't have the concept of the Linux -next trees.
