Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 22:19:34 +0000 (09:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 22:19:34 +0000 (09:19 +1100)
commit29896a6466bc77618258057492466aab0e522bf5
tree0eaa2791583de01ad3f3611a9af582626e57c797
parent829ccc2dd0260574245f6476c4f9b48b3305aa96
parentb579dfe71a6a5c3967ca9ad648673b6ca10ab0d5
Merge branch 'for-next' of git://git./linux/kernel/git/riscv/linux.git

# Conflicts:
# arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
# arch/riscv/include/asm/sbi.h
arch/riscv/Kconfig
arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
arch/riscv/configs/defconfig
arch/riscv/configs/rv32_defconfig
arch/riscv/include/asm/sbi.h
arch/riscv/mm/fault.c
arch/riscv/net/bpf_jit_comp64.c
scripts/sorttable.c