diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-23 13:42:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-23 13:42:46 -0700 |
| commit | f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 (patch) | |
| tree | ef05b782ca33ce918ea37b42d4709057dbc2f388 /MAINTAINERS | |
| parent | d15be546031cf65a0fc34879beca02fd90fe7ac7 (diff) | |
| parent | 0cfa112b33aba4473b00151c75b87818a835702a (diff) | |
| download | lwn-f37e99aca03f63aa3f2bd13ceaf769455d12c4b0.tar.gz lwn-f37e99aca03f63aa3f2bd13ceaf769455d12c4b0.zip | |
Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0887816d125e..e64cdde81851 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14863,6 +14863,7 @@ F: drivers/s390/block/dasd* F: include/linux/dasd_mod.h S390 IOMMU (PCI) +M: Matthew Rosato <mjrosato@linux.ibm.com> M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> L: linux-s390@vger.kernel.org S: Supported |