On Tue, 30 Mar 2021 15:40:34 PDT (-0700), Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/mm/kasan_init.c
between commits:
f3773dd031de ("riscv: Ensure page table writes are flushed when initializing KASAN
vmalloc")
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/mm/kasan_init.c
between commits:
f3773dd031de ("riscv: Ensure page table writes are flushed when initializing
KASAN vmalloc")
78947bdfd752 ("RISC-V: kasan: Declare kasan_shallow_populate() static")
from
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
drivers/soc/Makefile
between commit:
89d4f98ae90d ("ARM: remove zte zx platform")
from Linus' tree and commits:
08734e0581a5 ("riscv: Use vendor name for K210 SoC support")
e134d426e1a3 ("soc: canaan: Sort the
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/kernel/vdso/Makefile
between commit:
a96843372331 ("kbuild: explicitly specify the build id style")
from Linus' tree and commit:
f69e1c7418b1 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+")
4 matches
Mail list logo