From: Heiko Carstens <hca@linux.ibm.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
linux-s390@vger.kernel.org
Subject: Re: [PATCH 1/2] s390/kmsan: Fix merge conflict with get_lowcore() introduction
Date: Tue, 23 Jul 2024 15:18:05 +0200 [thread overview]
Message-ID: <20240723131805.6750-A-hca@linux.ibm.com> (raw)
In-Reply-To: <20240723124441.120044-2-iii@linux.ibm.com>
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@linux.ibm.com>
> ---
> arch/s390/include/asm/kmsan.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
next prev parent reply other threads:[~2024-07-23 13:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 12:44 [PATCH 0/2] s390/kmsan: Two follow-up patches Ilya Leoshkevich
2024-07-23 12:44 ` [PATCH 1/2] s390/kmsan: Fix merge conflict with get_lowcore() introduction Ilya Leoshkevich
2024-07-23 13:18 ` Heiko Carstens [this message]
2024-07-25 9:10 ` Alexander Gordeev
2024-07-23 12:44 ` [PATCH 2/2] s390/ptdump: Add KMSAN page markers Ilya Leoshkevich
2024-07-23 13:18 ` Heiko Carstens
2024-07-25 9:10 ` Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240723131805.6750-A-hca@linux.ibm.com \
--to=hca@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=linux-s390@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox