[GIT PULL] RISC-V Patches for the 6.4 Merge Window, Part 1
Linus Torvalds
torvalds at linux-foundation.org
Fri Apr 28 17:08:53 PDT 2023
On Fri, Apr 28, 2023 at 9:09 AM Palmer Dabbelt <palmer at rivosinc.com> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.4-mw1
Ugh, so this conflicted pretty nastily in arch/riscv/mm/init.c between commits
ef69d2559fe9 ("riscv: Move early dtb mapping into the fixmap region")
8589e346bbb6 ("riscv: Move the linear mapping creation in its own function")
and while I did try to make sense of it all, and generated what looks
like a sane resolution to me, I did *not* do some kind of build check,
much less can I test anything.
So.. Caveat emptor. I may or may not have gotten that conflict right,
and you should most definitely double-check it very carefully.
Linus
More information about the linux-riscv
mailing list