From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2021 17:18:06 +0000 (-0800)
Subject: Merge tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: baikal/mips/sdk6.1~7064
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=2f63d56445560ce808feeefc1cde5f08bc2c5b4d;p=kernel.git

Merge tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull more s390 updates from Vasily Gorbik:

 - Add PCI automatic error recovery.

 - Fix tape driver timer initialization broken during timers api
   cleanup.

 - Fix bogus CPU measurement counters values on CPUs offlining.

 - Check the validity of subchanel before reading other fields in the
   schib in cio code.

* tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cio: check the subchannel validity for dev_busid
  s390/cpumf: cpum_cf PMU displays invalid value after hotplug remove
  s390/tape: fix timer initialization in tape_std_assign()
  s390/pci: implement minimal PCI error recovery
  PCI: Export pci_dev_lock()
  s390/pci: implement reset_slot for hotplug slot
  s390/pci: refresh function handle in iomap
---

2f63d56445560ce808feeefc1cde5f08bc2c5b4d