diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-23 22:42:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-23 22:42:46 +0200 |
| commit | f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 (patch) | |
| tree | ef05b782ca33ce918ea37b42d4709057dbc2f388 /kernel/events/uprobes.c | |
| parent | Merge tag 'media/v5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | MAINTAINERS: add Matthew for s390 IOMMU (diff) | |
| download | linux-f37e99aca03f63aa3f2bd13ceaf769455d12c4b0.tar.xz linux-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 'kernel/events/uprobes.c')
0 files changed, 0 insertions, 0 deletions