From: Linus Torvalds Date: Tue, 28 Jan 2020 00:37:40 +0000 (-0800) Subject: Merge tag 'timers-urgent-2020-01-27' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15~4666 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a56c41e5d766871231828046f477611d6ee7d2db;p=mirror_ubuntu-kernels.git Merge tag 'timers-urgent-2020-01-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fixes from Thomas Gleixner: "Two fixes for the generic VDSO code which missed 5.5: - Make the update to the coarse timekeeper unconditional. This is required because the coarse timekeeper interfaces in the VDSO do not depend on a VDSO capable clocksource. If the system does not have a VDSO capable clocksource and the update is depending on the VDSO capable clocksource, the coarse VDSO interfaces would operate on stale data forever. - Invert the logic of __arch_update_vdso_data() to avoid further head scratching. Tripped over this several times while analyzing the update problem above" * tag 'timers-urgent-2020-01-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lib/vdso: Update coarse timekeeper unconditionally lib/vdso: Make __arch_update_vdso_data() logic understandable --- a56c41e5d766871231828046f477611d6ee7d2db