Merge tag 'ktime-get-clock-ts64-for-ptp' into timers/ptp
authorThomas Gleixner <tglx@linutronix.de>
Thu, 3 Jul 2025 12:35:53 +0000 (14:35 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 3 Jul 2025 12:35:53 +0000 (14:35 +0200)
commita6d9638d4da9740c189c141510584161ffd84307
tree905c1037b51f0cdff5a1dec3ec2999fe0f4f3bab
parent7b95663a3d96b39b40f169dba5faef3e20163c5c
parent5b605dbee07dda8fd538af1f07cbf1baf0a49cbc
Merge tag 'ktime-get-clock-ts64-for-ptp' into timers/ptp

Pull the base implementation of ktime_get_clock_ts64() for PTP, which
contains a temporary CLOCK_AUX* workaround. That was created to allow
integration of depending changes into the networking tree. The workaround
is going to be removed in a subsequent change in the timekeeping tree.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/linux/timekeeping.h
kernel/time/timekeeping.c