]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'for-6.0/dax' into libnvdimm-fixes
authorDan Williams <dan.j.williams@intel.com>
Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
Pick up another "Soft Reservation" fix for v6.0-final on top of some
straggling nvdimm fixes that missed v5.19.

1  2 
drivers/nvdimm/pmem.c
fs/dax.c

Simple merge
diff --cc fs/dax.c
Simple merge