[GIT PULL] dax-locking for 4.7