Merge a31128384dfd ("Merge tag 'libnvdimm-fixes-5.9-rc7' of git://git.kernel.org...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Sep 2020 16:23:56 +0000 (18:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Sep 2020 16:23:56 +0000 (18:23 +0200)
commit55be22adf11b48c80ea181366685ec91a4700b7e
tree1e4df9fa9463cecb4f264843c31616824ce2b84c
parent629b9111535f2a2607bbea1599d285a25f32835d
parenta31128384dfd9ca11f15ef4ea73df25e394846d1
Merge a31128384dfd ("Merge tag 'libnvdimm-fixes-5.9-rc7' of git://git./linux/kernel/git/nvdimm/nvdimm") into usb-next

We need the dax build fix in here as well, so that the build does not
break.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>