Merge branch 'for-6.0/dax' into libnvdimm-fixes

author Dan Williams <[email protected]>

Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)

committer Dan Williams <[email protected]>

Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
author Dan Williams <[email protected]>
Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
committer Dan Williams <[email protected]>
Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
diff --cc drivers/nvdimm/pmem.c
Simple merge
diff --cc fs/dax.c
Simple merge
author	Dan Williams <[email protected]>
	Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
committer	Dan Williams <[email protected]>
	Sun, 25 Sep 2022 01:14:12 +0000 (18:14 -0700)
		1	2
drivers/nvdimm/pmem.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/dax.c	patch \|	diff1 \|	diff2 \|	blob \| history