[GIT PULL] more s390 updates for 5.8-rc5

[Heiko Carstens]

Hi Linus,

please pull more small s390 updates for 5.8-rc5.

This request 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.

Thanks,
Heiko

The following changes since commit dcb7fd82c75ee2d6e6f9d8cc71c52519ed52e258:

  Linux 5.8-rc4 (2020-07-05 16:20:22 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.8-5

for you to fetch changes up to dd9ce2d6eeaebbdd342cbe095b7a195d569f18d3:

  MAINTAINERS: update email address for Gerald Schaefer (2020-07-10 15:06:49 +0200)

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

- Fix huge pte soft dirty copying.

----------------------------------------------------------------
Gerald Schaefer (1):
      MAINTAINERS: update email address for Gerald Schaefer

Heiko Carstens (1):
      MAINTAINERS: update email address for Heiko Carstens

Janosch Frank (1):
      s390/mm: fix huge pte soft dirty copying

 .mailmap                   | 5 +++++
 MAINTAINERS                | 8 ++++----
 arch/s390/mm/hugetlbpage.c | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index c69d9c734fb5..6da12dfd10dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -90,11 +90,16 @@ Frank Rowand <frowand.list@xxxxxxxxx> <frank.rowand@xxxxxxxxxxxxxx>
 Frank Zago <fzago@xxxxxxxxxxxxxxxxxxxxx>
 Gao Xiang <xiang@xxxxxxxxxx> <gaoxiang25@xxxxxxxxxx>
 Gao Xiang <xiang@xxxxxxxxxx> <hsiangkao@xxxxxxx>
+Gerald Schaefer <gerald.schaefer@xxxxxxxxxxxxx> <gerald.schaefer@xxxxxxxxxx>
+Gerald Schaefer <gerald.schaefer@xxxxxxxxxxxxx> <geraldsc@xxxxxxxxxx>
+Gerald Schaefer <gerald.schaefer@xxxxxxxxxxxxx> <geraldsc@xxxxxxxxxxxxxxxxxx>
 Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <gregkh@xxxxxxx>
 Greg Kroah-Hartman <greg@xxxxxxxxx>
 Gregory CLEMENT <gregory.clement@xxxxxxxxxxx> <gregory.clement@xxxxxxxxxxxxxxxxxx>
 Hanjun Guo <guohanjun@xxxxxxxxxx> <hanjun.guo@xxxxxxxxxx>
+Heiko Carstens <hca@xxxxxxxxxxxxx> <h.carstens@xxxxxxxxxx>
+Heiko Carstens <hca@xxxxxxxxxxxxx> <heiko.carstens@xxxxxxxxxx>
 Henk Vergonet <Henk.Vergonet@xxxxxxxxx>
 Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
 Henrik Rydberg <rydberg@xxxxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index 1d4aa7f942de..06f61751353c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3306,7 +3306,7 @@ X:	arch/riscv/net/bpf_jit_comp32.c
 
 BPF JIT for S390
 M:	Ilya Leoshkevich <iii@xxxxxxxxxxxxx>
-M:	Heiko Carstens <heiko.carstens@xxxxxxxxxx>
+M:	Heiko Carstens <hca@xxxxxxxxxxxxx>
 M:	Vasily Gorbik <gor@xxxxxxxxxxxxx>
 L:	netdev@xxxxxxxxxxxxxxx
 L:	bpf@xxxxxxxxxxxxxxx
@@ -14831,7 +14831,7 @@ S:	Maintained
 F:	drivers/video/fbdev/savage/
 
 S390
-M:	Heiko Carstens <heiko.carstens@xxxxxxxxxx>
+M:	Heiko Carstens <hca@xxxxxxxxxxxxx>
 M:	Vasily Gorbik <gor@xxxxxxxxxxxxx>
 M:	Christian Borntraeger <borntraeger@xxxxxxxxxx>
 L:	linux-s390@xxxxxxxxxxxxxxx
@@ -14862,7 +14862,7 @@ F:	drivers/s390/block/dasd*
 F:	include/linux/dasd_mod.h
 
 S390 IOMMU (PCI)
-M:	Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
+M:	Gerald Schaefer <gerald.schaefer@xxxxxxxxxxxxx>
 L:	linux-s390@xxxxxxxxxxxxxxx
 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@xxxxxxxxxxxxx>
-M:	Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
+M:	Gerald Schaefer <gerald.schaefer@xxxxxxxxxxxxx>
 L:	linux-s390@xxxxxxxxxxxxxxx
 S:	Supported
 W:	http://www.ibm.com/developerworks/linux/linux390/
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 82df06d720e8..3b5a4d25ca9b 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -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);