netdev - 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: <CA+h21hq1_wcB6_ffYdtOEyz8-aE=c7MiZP4en_VKOBodo=3VSQ@mail.gmail.com>
Date:   Wed, 5 Jun 2019 12:13:59 +0300
From:   Vladimir Oltean <olteanv@...il.com>
To:     David Miller <davem@...emloft.net>
Cc:     Florian Fainelli <f.fainelli@...il.com>,
        Vivien Didelot <vivien.didelot@...il.com>,
        Andrew Lunn <andrew@...n.ch>,
        Richard Cochran <richardcochran@...il.com>,
        John Stultz <john.stultz@...aro.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Stephen Boyd <sboyd@...nel.org>,
        lkml <linux-kernel@...r.kernel.org>,
        netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH v3 net-next 00/17] PTP support for the SJA1105 DSA driver

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?

Thanks!
-Vladimir