Re: [PATCH v3 net-next 00/17] PTP support for the SJA1105 DSA driver

[Vladimir Oltean]

On Wed, 5 Jun 2019 at 06:23, David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> From: Vladimir Oltean <olteanv@xxxxxxxxx>
> Date: Tue,  4 Jun 2019 20:07:39 +0300
>
> > This patchset adds the following:
> >
> >  - A timecounter/cyclecounter based PHC for the free-running
> >    timestamping clock of this switch.
> >
> >  - A state machine implemented in the DSA tagger for SJA1105, which
> >    keeps track of metadata follow-up Ethernet frames (the switch's way
> >    of transmitting RX timestamps).
>
> This series doesn't apply cleanly to net-next, please respin.
>
> Thank you.

Hi Dave,

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?

Thanks!
-Vladimir