Commit e8749d06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:
 "This is mainly due to the fact that Gerald Schaefer's and also my old
  email addresses currently do not work any longer. Therefore we decided
  to switch to new email addresses and reflect that in the MAINTAINERS
  file.

   - Update email addresses in MAINTAINERS file and add .mailmap entries
     for Gerald Schaefer and Heiko Carstens.

   - Fix huge pte soft dirty copying"

* tag 's390-5.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  MAINTAINERS: update email address for Gerald Schaefer
  MAINTAINERS: update email address for Heiko Carstens
  s390/mm: fix huge pte soft dirty copying
parents cb24c61b dd9ce2d6

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -90,11 +90,16 @@ Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com> 
Frank Zago <fzago@systemfabricworks.com>

Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>

Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -3306,7 +3306,7 @@ X: arch/riscv/net/bpf_jit_comp32.c 














BPF JIT for S390















M:	Ilya Leoshkevich <iii@linux.ibm.com>













M:	Heiko Carstens <heiko.carstens@de.ibm.com>













M:	Heiko Carstens <hca@linux.ibm.com>















M:	Vasily Gorbik <gor@linux.ibm.com>















L:	netdev@vger.kernel.org















L:	bpf@vger.kernel.org










@@ -14831,7 +14831,7 @@ S:	Maintained













F:	drivers/video/fbdev/savage/





























S390













M:	Heiko Carstens <heiko.carstens@de.ibm.com>













M:	Heiko Carstens <hca@linux.ibm.com>















M:	Vasily Gorbik <gor@linux.ibm.com>















M:	Christian Borntraeger <borntraeger@de.ibm.com>















L:	linux-s390@vger.kernel.org










@@ -14862,7 +14862,7 @@ F:	drivers/s390/block/dasd*













F:	include/linux/dasd_mod.h





























S390 IOMMU (PCI)













M:	Gerald Schaefer <gerald.schaefer@de.ibm.com>













M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>















L:	linux-s390@vger.kernel.org















S:	Supported















W:	http://www.ibm.com/developerworks/linux/linux390/










@@ -14890,7 +14890,7 @@ F:	drivers/s390/net/



























S390 PCI SUBSYSTEM















M:	Niklas Schnelle <schnelle@linux.ibm.com>













M:	Gerald Schaefer <gerald.schaefer@de.ibm.com>













M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>















L:	linux-s390@vger.kernel.org















S:	Supported















W:	http://www.ibm.com/developerworks/linux/linux390/

































arch/s390/mm/hugetlbpage.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -117,7 +117,7 @@ static inline pte_t __rste_to_pte(unsigned long rste)













					     _PAGE_YOUNG);















#ifdef CONFIG_MEM_SOFT_DIRTY















		pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_SOFT_DIRTY,













					     _PAGE_DIRTY);













					     _PAGE_SOFT_DIRTY);















#endif















		pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_NOEXEC,















					     _PAGE_NOEXEC);



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE