From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2021 18:39:28 +0000 (-0700)
Subject: Merge tag 's390-5.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: baikal/aarch64/sdk6.1~7004
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=721d125f80d253351e200448caa017aec44d7e63;p=kernel.git

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

Pull s390 updates from Heiko Carstens:

 - disable preemption when accessing local per-cpu variables in the new
   counter set driver

 - fix by a factor of four increased steal time due to missing
   cputime_to_nsecs() conversion

 - fix PCI device structure leak

* tag 's390-5.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: fix leak of PCI device structure
  s390/vtime: fix increased steal time accounting
  s390/cpumf: disable preemption when accessing per-cpu variable
---

721d125f80d253351e200448caa017aec44d7e63