From: Linus Torvalds Date: Tue, 28 Jan 2020 00:42:11 +0000 (-0800) Subject: Merge tag 'core-core-2020-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~4665 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b11c89a158f29a9b9d740f8f60b74f261ce6557f;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'core-core-2020-01-28' of git://git./linux/kernel/git/tip/tip Pull watchdog updates from Thomas Gleixner: "A set of watchdog/softlockup related improvements: - Enforce that the watchdog timestamp is always valid on boot. The original implementation caused a watchdog disabled gap of one second in the boot process due to truncation of the underlying sched clock. The sched clock is divided by 1e9 to convert nanoseconds to seconds. So for the first second of the boot process the result is 0 which is at the same time the indicator to disable the watchdog. The trivial fix is to change the disabled indicator to ULONG_MAX. - Two cleanup patches removing unused and redundant code which got forgotten to be cleaned up in previous changes" * tag 'core-core-2020-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: watchdog/softlockup: Enforce that timestamp is valid on boot watchdog/softlockup: Remove obsolete check of last reported task watchdog: Remove soft_lockup_hrtimer_cnt and related code --- b11c89a158f29a9b9d740f8f60b74f261ce6557f