From: Dan Williams <dan.j.williams@intel.com>
Date: Sat, 10 Apr 2021 05:00:09 +0000 (-0700)
Subject: Merge branch 'for-5.12/dax' into libnvdimm-fixes
X-Git-Tag: v5.12-rc8~8^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11d2498f1568a0f923dc8ef7621de15a9e89267f;p=thirdparty%2Flinux.git

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

Pick up dax compile fix.
---

11d2498f1568a0f923dc8ef7621de15a9e89267f