From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Jul 2020 20:42:46 +0000 (-0700)
Subject: Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f37e99aca03f63aa3f2bd13ceaf769455d12c4b0;p=linux.git

Merge tag 's390-5.8-6' of git://git./linux/kernel/git/s390/linux into master

Pull s390 fixes from Heiko Carstens:

 - Change cpum_cf/perf counter name from DFLT_CCERROR to DFLT_CCFINISH
   to reflect reality and avoid further confusion. This is a user space
   visible change therefore the commit has also a stable tag for 5.7,
   where this counter was introduced.

 - Add Matthew Rosato as s390 IOMMU maintainer.

* tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  MAINTAINERS: add Matthew for s390 IOMMU
  s390/cpum_cf,perf: change DFLT_CCERROR counter name
---

f37e99aca03f63aa3f2bd13ceaf769455d12c4b0