tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Vasily Gorbik:
"Maintainers and reviewers changes:

- Add Alexander Gordeev as maintainer for s390.

- Christian Borntraeger will focus on s390 KVM maintainership and
stays as s390 reviewer.

Fixes:

- Fix clang build of modules loader KUnit test.

- Fix kernel panic in CIO code on FCES path-event when no driver is
attached to a device or the driver does not provide the path_event
function"

* tag 's390-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/cio: verify the driver availability for path_event call
s390/module: fix building test_modules_helpers.o with clang
MAINTAINERS: downgrade myself to Reviewer for s390
MAINTAINERS: add Alexander Gordeev as maintainer for s390

Linus Torvalds a4fd49cd 4a387c98

+6 -6
+2 -2
MAINTAINERS
··· 16833 16833 S390 16834 16834 M: Heiko Carstens <hca@linux.ibm.com> 16835 16835 M: Vasily Gorbik <gor@linux.ibm.com> 16836 - M: Christian Borntraeger <borntraeger@linux.ibm.com> 16837 - R: Alexander Gordeev <agordeev@linux.ibm.com> 16836 + M: Alexander Gordeev <agordeev@linux.ibm.com> 16837 + R: Christian Borntraeger <borntraeger@linux.ibm.com> 16838 16838 R: Sven Schnelle <svens@linux.ibm.com> 16839 16839 L: linux-s390@vger.kernel.org 16840 16840 S: Supported
-3
arch/s390/lib/test_modules.c
··· 5 5 6 6 #include "test_modules.h" 7 7 8 - #define DECLARE_RETURN(i) int test_modules_return_ ## i(void) 9 - REPEAT_10000(DECLARE_RETURN); 10 - 11 8 /* 12 9 * Test that modules with many relocations are loaded properly. 13 10 */
+3
arch/s390/lib/test_modules.h
··· 47 47 __REPEAT_10000_1(f, 8); \ 48 48 __REPEAT_10000_1(f, 9) 49 49 50 + #define DECLARE_RETURN(i) int test_modules_return_ ## i(void) 51 + REPEAT_10000(DECLARE_RETURN); 52 + 50 53 #endif
+1 -1
drivers/s390/cio/device.c
··· 1180 1180 else 1181 1181 path_event[chpid] = PE_NONE; 1182 1182 } 1183 - if (cdev) 1183 + if (cdev && cdev->drv && cdev->drv->path_event) 1184 1184 cdev->drv->path_event(cdev, path_event); 1185 1185 break; 1186 1186 }