]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'risc-v/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:08:11 +0000 (09:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:08:11 +0000 (09:08 +1000)
commit3eaee2a399090653b41b87c27353039967529fe1
tree69f1458cbcf92087b299306e72b872452ab244aa
parent29ec3b84318eb81197c9dea1137ae30685e0a612
parentf54c7b5898d31eda3d6608da13b55c0466ba49fe
Merge remote-tracking branch 'risc-v/for-next'

# Conflicts:
# Documentation/admin-guide/kernel-parameters.txt
# arch/riscv/kernel/setup.c
# arch/riscv/mm/kasan_init.c
14 files changed:
Documentation/admin-guide/kernel-parameters.txt
arch/riscv/Kconfig
arch/riscv/Kconfig.socs
arch/riscv/include/asm/sbi.h
arch/riscv/kernel/Makefile
arch/riscv/kernel/entry.S
arch/riscv/kernel/probes/kprobes.c
arch/riscv/kernel/sbi.c
arch/riscv/kernel/time.c
arch/riscv/kernel/traps.c
arch/riscv/mm/fault.c
arch/riscv/mm/init.c
arch/riscv/mm/kasan_init.c
scripts/recordmcount.pl