From: Linus Torvalds Date: Sun, 19 Apr 2020 18:46:21 +0000 (-0700) Subject: Merge tag 'timers-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: microblaze-v5.10~952 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=3e0dea57686d8a0cb8b870de0f5ccbd2e941d8b3;p=linux-2.6-microblaze.git Merge tag 'timers-urgent-2020-04-19' of git://git./linux/kernel/git/tip/tip Pull time namespace fix from Thomas Gleixner: "An update for the proc interface of time namespaces: Use symbolic names instead of clockid numbers. The usability nuisance of numbers was noticed by Michael when polishing the man page" * tag 'timers-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: proc, time/namespace: Show clock symbolic names in /proc/pid/timens_offsets --- 3e0dea57686d8a0cb8b870de0f5ccbd2e941d8b3