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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190605.114429.1672040440449676386.davem@davemloft.net>
Date:   Wed, 05 Jun 2019 11:44:29 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     olteanv@...il.com
Cc:     f.fainelli@...il.com, vivien.didelot@...il.com, andrew@...n.ch,
        richardcochran@...il.com, john.stultz@...aro.org,
        tglx@...utronix.de, sboyd@...nel.org, linux-kernel@...r.kernel.org,
        netdev@...r.kernel.org
Subject: Re: [PATCH v3 net-next 00/17] PTP support for the SJA1105 DSA
 driver

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

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