[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4cab9be0-3516-454f-883b-7a999994c447@redhat.com>
Date: Thu, 3 Jul 2025 15:48:10 +0200
From: Paolo Abeni <pabeni@...hat.com>
To: Thomas Gleixner <tglx@...utronix.de>, LKML <linux-kernel@...r.kernel.org>
Cc: netdev@...r.kernel.org, Richard Cochran <richardcochran@...il.com>,
Christopher Hall <christopher.s.hall@...el.com>,
John Stultz <jstultz@...gle.com>, Frederic Weisbecker <frederic@...nel.org>,
Anna-Maria Behnsen <anna-maria@...utronix.de>,
Miroslav Lichvar <mlichvar@...hat.com>,
Werner Abt <werner.abt@...nberg-usa.com>,
David Woodhouse <dwmw2@...radead.org>, Stephen Boyd <sboyd@...nel.org>,
Thomas Weißschuh <thomas.weissschuh@...utronix.de>,
Kurt Kanzenbach <kurt@...utronix.de>, Nam Cao <namcao@...utronix.de>,
Antoine Tenart <atenart@...nel.org>
Subject: Re: [patch V2 0/3] ptp: Provide support for auxiliary clocks for
PTP_SYS_OFFSET_EXTENDED
On 7/3/25 2:48 PM, Thomas Gleixner wrote:
> On Thu, Jul 03 2025 at 12:27, Paolo Abeni wrote:
>> On 7/1/25 3:26 PM, Thomas Gleixner wrote:
>>> Merge logistics if agreed on:
>>>
>>> 1) Patch #1 is applied to the tip tree on top of plain v6.16-rc1 and
>>> tagged
>>>
>>> 2) That tag is merged into tip:timers/ptp and the temporary CLOCK_AUX
>>> define is removed in a subsequent commit
>>>
>>> 3) Network folks merge the tag and apply patches #2 + #3
>>>
>>> So the only fallout from this are the extra merges in both trees and the
>>> cleanup commit in the tip tree. But that way there are no dependencies and
>>> no duplicate commits with different SHAs.
>>>
>>> Thoughts?
>>
>> I'm sorry for the latency here; the plan works for me! I'll wait for the
>> tag reference.
>
> No problem. Rome wasn't built in a day either :)
>
>> Could you please drop a notice here when such tag will be available?
>
> Here you go:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ktime-get-clock-ts64-for-ptp
>
> I merged it locally into net-next, applied the PTP patches on top and
> verified that the combination with the tip timers/ptp branch, which has
> the tag integrated and the workaround removed, creates the expected
> working result.
I had to wrestle a bit with the script I use - since the whole thing was
a little different from my usual workflow - but it's in now, hoping I
did not mess badly with something.
/P
Powered by blists - more mailing lists