summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-22 10:22:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-22 10:22:47 -0800
commit7214618c60e947b8cea12b47d8279bd4220f21bc (patch)
treed2478662f5d8a5c5c45ef65c6bcc08b9fe4e1a24 /drivers/sh
parent78bac77b521b032f96077c21241cc5d5668482c5 (diff)
parent9209fb51896fe0eef8dfac85afe1f357e9265c0d (diff)
Merge tag 'riscv/for-v5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Paul Walmsley: "Several fixes, and one cleanup, for RISC-V. Fixes: - Fix an error in a Kconfig file that resulted in an undefined Kconfig option "CONFIG_CONFIG_MMU" - Fix undefined Kconfig option "CONFIG_CONFIG_MMU" - Fix scratch register clearing in M-mode (affects nommu users) - Fix a mismerge on my part that broke the build for CONFIG_SPARSEMEM_VMEMMAP users Cleanup: - Move SiFive L2 cache-related code to drivers/soc, per request" * tag 'riscv/for-v5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: move sifive_l2_cache.c to drivers/soc riscv: define vmemmap before pfn_to_page calls riscv: fix scratch register clearing in M-mode. riscv: Fix use of undefined config option CONFIG_CONFIG_MMU
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions