From: Thomas Gleixner <tglx@linutronix.de>
To: Paolo Abeni <pabeni@redhat.com>, LKML <linux-kernel@vger.kernel.org>
Cc: netdev@vger.kernel.org,
"Richard Cochran" <richardcochran@gmail.com>,
"Christopher Hall" <christopher.s.hall@intel.com>,
"John Stultz" <jstultz@google.com>,
"Frederic Weisbecker" <frederic@kernel.org>,
"Anna-Maria Behnsen" <anna-maria@linutronix.de>,
"Miroslav Lichvar" <mlichvar@redhat.com>,
"Werner Abt" <werner.abt@meinberg-usa.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Stephen Boyd" <sboyd@kernel.org>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
"Kurt Kanzenbach" <kurt@linutronix.de>,
"Nam Cao" <namcao@linutronix.de>,
"Antoine Tenart" <atenart@kernel.org>
Subject: Re: [patch V2 0/3] ptp: Provide support for auxiliary clocks for PTP_SYS_OFFSET_EXTENDED
Date: Thu, 03 Jul 2025 14:48:47 +0200 [thread overview]
Message-ID: <87ecuxwic0.ffs@tglx> (raw)
In-Reply-To: <faca1b8e-bd39-4501-a380-24246a8234d6@redhat.com>
Paolo!
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.
Thanks,
tglx
next prev parent reply other threads:[~2025-07-03 12:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-01 13:26 [patch V2 0/3] ptp: Provide support for auxiliary clocks for PTP_SYS_OFFSET_EXTENDED Thomas Gleixner
2025-07-01 13:26 ` [patch V2 1/3] timekeeping: Provide ktime_get_clock_ts64() Thomas Gleixner
2025-07-03 12:49 ` [tip: timers/ptp] " tip-bot2 for Thomas Gleixner
2025-07-01 13:27 ` [patch V2 2/3] ptp: Use ktime_get_clock_ts64() for timestamping Thomas Gleixner
2025-07-01 13:27 ` [patch V2 3/3] ptp: Enable auxiliary clocks for PTP_SYS_OFFSET_EXTENDED Thomas Gleixner
2025-07-03 10:27 ` [patch V2 0/3] ptp: Provide support for " Paolo Abeni
2025-07-03 12:48 ` Thomas Gleixner [this message]
2025-07-03 13:48 ` Paolo Abeni
2025-07-03 16:52 ` Thomas Gleixner
2025-07-03 12:49 ` [tip: timers/ptp] timekeeping: Remove the temporary CLOCK_AUX workaround tip-bot2 for Thomas Gleixner
2025-07-03 13:50 ` [patch V2 0/3] ptp: Provide support for auxiliary clocks for PTP_SYS_OFFSET_EXTENDED patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ecuxwic0.ffs@tglx \
--to=tglx@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=atenart@kernel.org \
--cc=christopher.s.hall@intel.com \
--cc=dwmw2@infradead.org \
--cc=frederic@kernel.org \
--cc=jstultz@google.com \
--cc=kurt@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mlichvar@redhat.com \
--cc=namcao@linutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sboyd@kernel.org \
--cc=thomas.weissschuh@linutronix.de \
--cc=werner.abt@meinberg-usa.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.