Commit a6d9638d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parents 7b95663a 5b605dbe
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment