This is a follow up to the V1 series, which can be found here:

     https://lore.kernel.org/all/20250626124327.667087805@linutronix.de

to address the merge logistics problem, which I created myself.

Changes vs. V1:

    - Make patch 1, which provides the timestamping function temporarily
      define CLOCK_AUX* if undefined so that it can be merged independently,

    - Add a missing check for CONFIG_POSIX_AUX_CLOCK in the PTP IOCTL

    - Picked up tags

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?

Due to the above constraints there is no branch offered to pull from right
now. Sorry for the inconveniance. Should have thought about that earlier.

Thanks,

	tglx
---
 drivers/ptp/ptp_chardev.c        |   24 +++++++++++++++++++-----
 include/linux/ptp_clock_kernel.h |   34 ++++------------------------------
 include/linux/timekeeping.h      |   10 ++++++++++
 kernel/time/timekeeping.c        |   33 +++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 35 deletions(-)

On 7/1/25 3:26 PM, Thomas Gleixner wrote:
> This is a follow up to the V1 series, which can be found here:
> 
>      https://lore.kernel.org/all/20250626124327.667087805@linutronix.de
> 
> to address the merge logistics problem, which I created myself.
> 
> Changes vs. V1:
> 
>     - Make patch 1, which provides the timestamping function temporarily
>       define CLOCK_AUX* if undefined so that it can be merged independently,
> 
>     - Add a missing check for CONFIG_POSIX_AUX_CLOCK in the PTP IOCTL
> 
>     - Picked up tags
> 
> 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.

Could you please drop a notice here when such tag will be available?

Thanks,

Paolo

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

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

On Thu, Jul 03 2025 at 15:48, Paolo Abeni wrote:
> On 7/3/25 2:48 PM, Thomas Gleixner wrote:
>> 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.

Looks perfect!

Thank you for the extra mile!

      tglx