]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'riscv-for-linus-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Jun 2024 21:47:38 +0000 (14:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Jun 2024 21:47:38 +0000 (14:47 -0700)
Pull RISC-V fixes from Palmer Dabbelt:

 - Another fix to avoid allocating pages that overlap with ERR_PTR,
   which manifests on rv32

 - A revert for the badaccess patch I incorrectly picked up an early
   version of

* tag 'riscv-for-linus-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  Revert "riscv: mm: accelerate pagefault when badaccess"
  riscv: fix overlap of allocated page and PTR_ERR


Trivial merge