]> www.infradead.org Git - users/jedix/linux-maple.git/commit
s390/kmsan: Fix merge conflict with get_lowcore() introduction
authorIlya Leoshkevich <iii@linux.ibm.com>
Tue, 23 Jul 2024 12:44:11 +0000 (14:44 +0200)
committerVasily Gorbik <gor@linux.ibm.com>
Tue, 23 Jul 2024 14:01:51 +0000 (16:01 +0200)
commitec25f99cc834644e6577fa11582f7691589ed8cc
tree66bf896417567673a40886ae8ad50ac5f11335e0
parente188e5d5ffd01d484b5255b88739fcf67b300223
s390/kmsan: Fix merge conflict with get_lowcore() introduction

Resolve the conflict between commit 2a48c8c9cf87 ("s390/kmsan:
implement the architecture-specific functions") and commit 39976f1278a9
("s390: Remove S390_lowcore").

Fixes: 2a48c8c9cf87 ("s390/kmsan: implement the architecture-specific functions")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20240723124441.120044-2-iii@linux.ibm.com
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
arch/s390/include/asm/kmsan.h