Recent changes (master)

Jens Axboe
2020-07-15T12:00:07Z

The following changes since commit 255f09d6d266c3e73abb9776ae481bb4d79caf00:

Merge branch 'io_uring-opt' of https://github.com/antonblanchard/fio (2020-07-13 08:01:52 -0600)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 37e8cc62319b30927a3147e25b16c3e00b84692f:

Merge branch 'fix_devdax' of https://github.com/harish-24/fio (2020-07-14 10:10:23 -0600)

----------------------------------------------------------------
Harish (1):
Fix: dev-dax engine building with make

Jens Axboe (1):
Merge branch 'fix_devdax' of https://github.com/harish-24/fio

Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

---

Diff of recent changes:

diff --git a/Makefile b/Makefile
index 8f8d9b9a..f374ac84 100644
--- a/Makefile
+++ b/Makefile
@@ -173,8 +173,8 @@ ifdef CONFIG_PMEMBLK
ENGINES += pmemblk
endif
ifdef CONFIG_LINUX_DEVDAX
- devdax_SRCS = engines/dev-dax.c
- devdax_LIBS = -lpmem
+ dev-dax_SRCS = engines/dev-dax.c
+ dev-dax_LIBS = -lpmem
ENGINES += dev-dax
endif
ifdef CONFIG_LIBPMEM