iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ec25f99cc8
linux/arch/s390
History
Ilya Leoshkevich ec25f99cc8 s390/kmsan: Fix merge conflict with get_lowcore() introduction 
Resolve the conflict between commit 2a48c8c9cf ("s390/kmsan:
implement the architecture-specific functions") and commit 39976f1278
("s390: Remove S390_lowcore").

Fixes: 2a48c8c9cf ("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>
2024-07-23 16:01:51 +02:00
..
appldata S390: Remove now superfluous sentinel elem from ctl_table arrays 2023-10-10 15:22:02 -07:00
boot - 875fa64577da ("mm/hugetlb_vmemmap: fix race with speculative PFN 2024-07-21 17:15:46 -07:00
configs s390: Update defconfigs 2024-07-02 10:16:16 +02:00
crypto s390/crc32: Add missing MODULE_DESCRIPTION() macro 2024-06-28 14:52:30 +02:00
hypfs s390/hypfs_diag: Diag204 busy loop 2024-07-10 19:50:45 +02:00
include s390/kmsan: Fix merge conflict with get_lowcore() introduction 2024-07-23 16:01:51 +02:00
kernel s390/setup: Fix __pa/__va for modules under non-GPL licenses 2024-07-23 15:54:58 +02:00
kvm ARM: 2024-07-20 12:41:03 -07:00
lib s390/lib: Add missing MODULE_DESCRIPTION() macros 2024-06-28 14:52:30 +02:00
mm - 875fa64577da ("mm/hugetlb_vmemmap: fix race with speculative PFN 2024-07-21 17:15:46 -07:00
net s390/bpf: Implement exceptions 2024-07-08 16:39:35 +02:00
pci s390/pci: Allow allocation of more than 1 MSI interrupt 2024-07-23 15:54:58 +02:00
purgatory Makefile: remove redundant tool coverage variables 2024-05-14 23:35:48 +09:00
tools s390/boot: Rework deployment of the kernel image 2024-04-17 13:38:02 +02:00
Kbuild - An extensive rework of kexec and crash Kconfig from Eric DeVolder 2023-08-29 14:53:51 -07:00
Kconfig - 875fa64577da ("mm/hugetlb_vmemmap: fix race with speculative PFN 2024-07-21 17:15:46 -07:00
Kconfig.debug
Makefile s390: use a larger stack for KMSAN 2024-07-03 19:30:24 -07:00