From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Mar 2021 17:54:22 +0000 (-0700)
Subject: Merge tag 's390-5.12-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: Ubuntu-5.13.0-19.19~3635
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6ac86aae89289121db784161fe318819778f7f2a;p=mirror_ubuntu-jammy-kernel.git

Merge tag 's390-5.12-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Heiko Carstens:

 - fix incorrect initialization and update of vdso data pages, which
   results in incorrect tod clock steering, and that
   clock_gettime(CLOCK_MONOTONIC_RAW, ...) returns incorrect values.

 - update MAINTAINERS for s390 vfio drivers

* tag 's390-5.12-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  MAINTAINERS: add backups for s390 vfio drivers
  s390/vdso: fix initializing and updating of vdso_data
  s390/vdso: fix tod_steering_delta type
  s390/vdso: copy tod_steering_delta value to vdso_data page
---

6ac86aae89289121db784161fe318819778f7f2a