Merge branch 'next/nommu' into for-next
authorPaul Walmsley <paul.walmsley@sifive.com>
Sat, 23 Nov 2019 02:59:09 +0000 (18:59 -0800)
committerPaul Walmsley <paul.walmsley@sifive.com>
Sat, 23 Nov 2019 02:59:09 +0000 (18:59 -0800)
commit5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb
treeb9f61d0544ed06b7f07000a11797711cdd97d83f
parent4a979862dde46b738316014ca4995eae2f428413
parent405fe7aa0dbaa6cb8cfe62771eee67076d30aca1
Merge branch 'next/nommu' into for-next

Conflicts:
arch/riscv/boot/Makefile
arch/riscv/include/asm/sbi.h
arch/riscv/Kconfig
arch/riscv/boot/Makefile
arch/riscv/include/asm/futex.h
arch/riscv/kernel/entry.S
arch/riscv/mm/init.c