Hello Linus,
please pull s390 changes for 5.15-rc6.
Thank you,
Vasily
The following changes since commit a46044a92add6a400f4dada7b943b30221f7cc80:
s390/pci: fix zpci_zdev_put() on reserve (2021-10-04 09:49:10 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.15-6
for you to fetch changes up to 8b7216439e2e2128f6f1a19ad4b6be94d8b0e23d:
s390: add Alexander Gordeev as reviewer (2021-10-13 14:37:44 +0200)
----------------------------------------------------------------
s390 update for v5.15-rc6
- Maintainers and reviewers changes:
- Cornelia decided to free up her time and step down from vfio-ccw
maintainer and s390 kvm reviewer duties.
- Add Alexander Gordeev as s390 arch code reviewer.
- Fix broken strrchr implementation.
----------------------------------------------------------------
Cornelia Huck (2):
KVM: s390: remove myself as reviewer
vfio-ccw: step down as maintainer
Heiko Carstens (1):
s390: add Alexander Gordeev as reviewer
Roberto Sassu (1):
s390: fix strrchr() implementation
MAINTAINERS | 3 +--
arch/s390/lib/string.c | 15 +++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index abdcbcfef73d..888b329413d3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10275,7 +10275,6 @@ KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
M: Christian Borntraeger <borntraeger@xxxxxxxxxx>
M: Janosch Frank <frankja@xxxxxxxxxxxxx>
R: David Hildenbrand <david@xxxxxxxxxx>
-R: Cornelia Huck <cohuck@xxxxxxxxxx>
R: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
L: kvm@xxxxxxxxxxxxxxx
S: Supported
@@ -16297,6 +16296,7 @@ S390
M: Heiko Carstens <hca@xxxxxxxxxxxxx>
M: Vasily Gorbik <gor@xxxxxxxxxxxxx>
M: Christian Borntraeger <borntraeger@xxxxxxxxxx>
+R: Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
L: linux-s390@xxxxxxxxxxxxxxx
S: Supported
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -16375,7 +16375,6 @@ F: drivers/s390/crypto/vfio_ap_ops.c
F: drivers/s390/crypto/vfio_ap_private.h
S390 VFIO-CCW DRIVER
-M: Cornelia Huck <cohuck@xxxxxxxxxx>
M: Eric Farman <farman@xxxxxxxxxxxxx>
M: Matthew Rosato <mjrosato@xxxxxxxxxxxxx>
R: Halil Pasic <pasic@xxxxxxxxxxxxx>
diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c
index cfcdf76d6a95..a95ca6df4e5e 100644
--- a/arch/s390/lib/string.c
+++ b/arch/s390/lib/string.c
@@ -259,14 +259,13 @@ EXPORT_SYMBOL(strcmp);
#ifdef __HAVE_ARCH_STRRCHR
char *strrchr(const char *s, int c)
{
- size_t len = __strend(s) - s;
-
- if (len)
- do {
- if (s[len] == (char) c)
- return (char *) s + len;
- } while (--len > 0);
- return NULL;
+ ssize_t len = __strend(s) - s;
+
+ do {
+ if (s[len] == (char)c)
+ return (char *)s + len;
+ } while (--len >= 0);
+ return NULL;
}
EXPORT_SYMBOL(strrchr);
#endif
