lkml.org 
[lkml]   [2019]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v3 net-next 00/17] PTP support for the SJA1105 DSA driver
From
From: Vladimir Oltean <olteanv@gmail.com>
Date: Wed, 5 Jun 2019 12:13:59 +0300

> On Wed, 5 Jun 2019 at 06:23, David Miller <davem@davemloft.net> wrote:
>>
>> From: Vladimir Oltean <olteanv@gmail.com>
>> 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?

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

Thanks for letting me know.

\
 
 \ /
  Last update: 2019-06-05 20:45    [W:0.136 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site