On Fri, 7 Jun 2019 at 22:15, David Miller [off-list ref] wrote:

From: David Miller <davem@davemloft.net>
Date: Wed, 05 Jun 2019 11:44:29 -0700 (PDT)

quoted

From: Vladimir Oltean <olteanv@gmail.com>
Date: Wed, 5 Jun 2019 12:13:59 +0300

quoted

It is conflicting because net-next at the moment lacks this patch that
I submitted to net:
https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git/commit/?id=e8d67fa5696e2fcaf956dae36d11e6eff5246101
What would you like me to do: resubmit after you merge net into
net-next, add the above patch to this series (which you'll have to
skip upon the next merge), or you can just cherry-pick it and then the
series will apply?

So let me bring this series back to state "Under Review" and I'll apply it
after I next merge net into net-next.

So I applied the series but it doesn't even build:

ERROR: "sja1105_unpack" [drivers/net/dsa/sja1105/sja1105_ptp.ko] undefined!
ERROR: "sja1105_spi_send_packed_buf" [drivers/net/dsa/sja1105/sja1105_ptp.ko] undefined!
ERROR: "sja1105_pack" [drivers/net/dsa/sja1105/sja1105_ptp.ko] undefined!
ERROR: "sja1105_spi_send_int" [drivers/net/dsa/sja1105/sja1105_ptp.ko] undefined!
ERROR: "sja1105_get_ts_info" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105pqrs_ptp_cmd" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105_ptp_clock_unregister" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105_ptpegr_ts_poll" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105et_ptp_cmd" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105_ptp_reset" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105_tstamp_reconstruct" [drivers/net/dsa/sja1105/sja1105.ko] undefined!
ERROR: "sja1105_ptp_clock_register" [drivers/net/dsa/sja1105/sja1105.ko] undefined!

You have to test better with the various modular/non-modular combinations.

Thanks.

Ok, my bad, I'll resubmit it tomorrow.

Thanks!
-Vladimir