Skip to content
Commit ec25f99c authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Vasily Gorbik
Browse files

s390/kmsan: Fix merge conflict with get_lowcore() introduction

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

Fixes: 2a48c8c9

 ("s390/kmsan: implement the architecture-specific functions")
Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20240723124441.120044-2-iii@linux.ibm.com
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent e188e5d5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment