Merge branch 'for-4.16/dax' into libnvdimm-for-next

diff --cc drivers/acpi/nfit/core.c
Simple merge

diff --cc drivers/nvdimm/btt.c
index 5860f99,c586bcd..2ef544f
--- 1/drivers/nvdimm/btt.c
--- 2/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@@ -759,6 -884,14 +885,13 @@@ static int discover_arenas(struct btt *
                arena->external_lba_start = cur_nlba;
                parse_arena_meta(arena, super, cur_off);
  
 -              mutex_init(&arena->err_lock);
+               ret = log_set_indices(arena);
+               if (ret) {
+                       dev_err(to_dev(arena),
+                               "Unable to deduce log/padding indices\n");
+                       goto out;
+               }
+ 
                ret = btt_freelist_init(arena);
                if (ret)
                        goto out;