Merge patch series "Add PMEM support for RISC-V"

Anup Patel <apatel@ventanamicro.com> says:

The Linux NVDIMM PEM drivers require arch support to map and access the
persistent memory device. This series adds RISC-V PMEM support using
recently added Svpbmt and Zicbom support.

* b4-shazam-merge:
  RISC-V: Enable PMEM drivers
  RISC-V: Implement arch specific PMEM APIs
  RISC-V: Fix MEMREMAP_WB for systems with Svpbmt

Link: https://lore.kernel.org/r/20221114090536.1662624-1-apatel@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/riscv/configs/defconfig
Simple merge

diff --cc arch/riscv/mm/Makefile
index ce7f121,b4f35da..2ac177c
--- 1/arch/riscv/mm/Makefile
--- 2/arch/riscv/mm/Makefile
+++ b/arch/riscv/mm/Makefile
@@@ -13,7 -13,7 +13,8 @@@ obj-y += extable.
  obj-$(CONFIG_MMU) += fault.o pageattr.o
  obj-y += cacheflush.o
  obj-y += context.o
 +obj-y += pgtable.o
+ obj-y += pmem.o
  
  ifeq ($(CONFIG_MMU),y)
  obj-$(CONFIG_SMP) += tlbflush.o