]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'riscv/for-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jan 2020 00:48:39 +0000 (16:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jan 2020 00:48:39 +0000 (16:48 -0800)
Pull RISC-V fixes from Paul Walmsley:
 "Two fixes for RISC-V:

   - Clear FP registers during boot when FP support is present, rather
     than when they aren't present

   - Move the header files associated with the SiFive L2 cache
     controller to drivers/soc (where the code was recently moved)"

* tag 'riscv/for-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fixup obvious bug for fp-regs reset
  riscv: move sifive_l2_cache.h to include/soc


Trivial merge