diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2024-07-23 14:44:11 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2024-07-23 16:01:51 +0200 |
| commit | ec25f99cc834644e6577fa11582f7691589ed8cc (patch) | |
| tree | 66bf896417567673a40886ae8ad50ac5f11335e0 /net/unix/af_unix.c | |
| parent | e188e5d5ffd01d484b5255b88739fcf67b300223 (diff) | |
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>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions