diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-31 10:49:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-31 10:49:25 -0700 |
| commit | 27a03b1a71b9adfa7f4ef3f61452fb3bc5b195b1 (patch) | |
| tree | 3c2ce43bc1a82c2213139858be600d57cbd18e38 /MAINTAINERS | |
| parent | 702c31e8564c386dd5e304e46cf22fcaa40b1a66 (diff) | |
| parent | 674459be116955e025d6a5e6142e2d500103de8e (diff) | |
Merge tag 's390-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Heiko Carstens:
- Farewell Martin Schwidefsky: add Martin to CREDITS and remove him
from MAINTAINERS
- Vasily Gorbik and Christian Borntraeger join as maintainers for s390
- Fix locking bug in ctr(aes) and ctr(des) s390 specific ciphers
- A rather large patch which fixes gcm-aes-s390 scatter gather handling
- Fix zcrypt wrong dispatching for control domain CPRBs
- Fix assignment of bus resources in PCI code
- Fix structure definition for set PCI function
- Fix one compile error and one compile warning seen when
CONFIG_OPTIMIZE_INLINING is enabled
* tag 's390-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
MAINTAINERS: add Vasily Gorbik and Christian Borntraeger for s390
MAINTAINERS: Farewell Martin Schwidefsky
s390/crypto: fix possible sleep during spinlock aquired
s390/crypto: fix gcm-aes-s390 selftest failures
s390/zcrypt: Fix wrong dispatching for control domain CPRBs
s390/pci: fix assignment of bus resources
s390/pci: fix struct definition for set PCI function
s390: mark __cpacf_check_opcode() and cpacf_query_func() as __always_inline
s390: add unreachable() to dump_fault_info() to fix -Wmaybe-uninitialized
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 429c6c624861..fac3f405e7c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3049,8 +3049,9 @@ S: Maintained F: arch/riscv/net/ BPF JIT for S390 -M: Martin Schwidefsky <schwidefsky@de.ibm.com> M: Heiko Carstens <heiko.carstens@de.ibm.com> +M: Vasily Gorbik <gor@linux.ibm.com> +M: Christian Borntraeger <borntraeger@de.ibm.com> L: netdev@vger.kernel.org L: bpf@vger.kernel.org S: Maintained @@ -13614,8 +13615,9 @@ S: Maintained F: drivers/video/fbdev/savage/ S390 -M: Martin Schwidefsky <schwidefsky@de.ibm.com> M: Heiko Carstens <heiko.carstens@de.ibm.com> +M: Vasily Gorbik <gor@linux.ibm.com> +M: Christian Borntraeger <borntraeger@de.ibm.com> L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git |