]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 May 2017 00:35:34 +0000 (17:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 May 2017 00:35:34 +0000 (17:35 -0700)
commit8c3fc1643d13ff70110701d08beaf77dc20c7c0a
tree23f9688fe2ddcff44fb46fc9d84bac37e91e1e9a
parent0bdc6fd2329e51b9659d5192f4281493c15e95b3
parentf5705aa8cfed142d980ecac12bee0d81b756479e
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fixes from Dan Williams:
 "A couple of compile fixes.

  With the removal of the ->direct_access() method from
  block_device_operations in favor of a new dax_device + dax_operations
  we broke two configurations.

  The CONFIG_BLOCK=n case is fixed by compiling out the block+dax
  helpers in the dax core. Configurations with FS_DAX=n EXT4=y / XFS=y
  and DAX=m fail due to the helpers the builtin filesystem needs being
  in a module, so we stub out the helpers in the FS_DAX=n case."

* 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case
  dax: fix false CONFIG_BLOCK dependency