From: David Miller <da...@davemloft.net> Date: Thu, 07 Dec 2017 13:39:32 -0500 (EST)
> From: Aleksey Makarov <aleksey.maka...@cavium.com> > Date: Wed, 6 Dec 2017 16:30:56 +0300 > >> This series adds support for IEEE 1588 Precision Time Protocol >> to Cavium ethernet driver. > > Series applied, thank you. Actually, this doesn't even compile, I'm reverting: drivers/net/ethernet/cavium/common/cavium_ptp.c:64:20: error: redefinition of ‘cavium_ptp_get’ struct cavium_ptp *cavium_ptp_get(void) ^~~~~~~~~~~~~~ In file included from drivers/net/ethernet/cavium/common/cavium_ptp.c:19:0: drivers/net/ethernet/cavium/common/cavium_ptp.h:59:34: note: previous definition of ‘cavium_ptp_get’ was here static inline struct cavium_ptp *cavium_ptp_get(void) ^~~~~~~~~~~~~~ drivers/net/ethernet/cavium/common/cavium_ptp.c:84:6: error: redefinition of ‘cavium_ptp_put’ void cavium_ptp_put(struct cavium_ptp *ptp) ^~~~~~~~~~~~~~ In file included from drivers/net/ethernet/cavium/common/cavium_ptp.c:19:0: drivers/net/ethernet/cavium/common/cavium_ptp.h:64:20: note: previous definition of ‘cavium_ptp_put’ was here static inline void cavium_ptp_put(struct cavium_ptp *ptp) {} ^~~~~~~~~~~~~~