On Tue, Jul 23, 2024 at 02:44:11PM +0200, Ilya Leoshkevich wrote:
> 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@xxxxxxxxxxxxx>
> ---
> arch/s390/include/asm/kmsan.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Heiko Carstens <hca@xxxxxxxxxxxxx>
