From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 3 Jul 2025 12:35:53 +0000 (+0200)
Subject: Merge tag 'ktime-get-clock-ts64-for-ptp' into timers/ptp
X-Git-Tag: v6.17-rc1~155^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6d9638d4da9740c189c141510584161ffd84307;p=thirdparty%2Flinux.git

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>
---

a6d9638d4da9740c189c141510584161ffd84307