2020-07-10 13:50:31

by Heiko Carstens

Subject: [GIT PULL] more s390 updates for 5.8-rc5

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 <[email protected]> <[email protected]>
Frank Zago <[email protected]>
Gao Xiang <[email protected]> <[email protected]>
Gao Xiang <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <[email protected]>
Greg Kroah-Hartman <[email protected]>
Gregory CLEMENT <[email protected]> <[email protected]>
Hanjun Guo <[email protected]> <[email protected]>
+Heiko Carstens <[email protected]> <[email protected]>
+Heiko Carstens <[email protected]> <[email protected]>
Henk Vergonet <[email protected]>
Henrik Kretzschmar <[email protected]>
Henrik Rydberg <[email protected]>
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 <[email protected]>
-M: Heiko Carstens <[email protected]>
+M: Heiko Carstens <[email protected]>
M: Vasily Gorbik <[email protected]>
L: [email protected]
L: [email protected]
@@ -14831,7 +14831,7 @@ S: Maintained
F: drivers/video/fbdev/savage/

S390
-M: Heiko Carstens <[email protected]>
+M: Heiko Carstens <[email protected]>
M: Vasily Gorbik <[email protected]>
M: Christian Borntraeger <[email protected]>
L: [email protected]
@@ -14862,7 +14862,7 @@ F: drivers/s390/block/dasd*
F: include/linux/dasd_mod.h

S390 IOMMU (PCI)
-M: Gerald Schaefer <[email protected]>
+M: Gerald Schaefer <[email protected]>
L: [email protected]
S: Supported
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -14890,7 +14890,7 @@ F: drivers/s390/net/

S390 PCI SUBSYSTEM
M: Niklas Schnelle <[email protected]>
-M: Gerald Schaefer <[email protected]>
+M: Gerald Schaefer <[email protected]>
L: [email protected]
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);

2020-07-10 16:57:41

by pr-tracker-bot

Subject: Re: [GIT PULL] more s390 updates for 5.8-rc5

The pull request you sent on Fri, 10 Jul 2020 15:47:40 +0200:

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e8749d068855c2b075b3de1985e6af836a02b257

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker