Merge branch 'for-4.7/dsm' into libnvdimm-for-next

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

diff --cc drivers/acpi/nfit.h
index 5201840,f82fda5..46c5014
--- 1/drivers/acpi/nfit.h
--- 2/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@@ -109,8 -120,8 +120,9 @@@ struct nfit_mem 
        struct nfit_flush *nfit_flush;
        struct list_head list;
        struct acpi_device *adev;
 +      struct acpi_nfit_desc *acpi_desc;
        unsigned long dsm_mask;
+       int family;
  };
  
  struct acpi_nfit_desc {

diff --cc drivers/nvdimm/bus.c
Simple merge

diff --cc drivers/nvdimm/nd-core.h
Simple merge

diff --cc include/uapi/linux/ndctl.h
Simple merge

diff --cc tools/testing/nvdimm/test/nfit.c
index d1c98d4,e09a300..c919866
--- 1/tools/testing/nvdimm/test/nfit.c
--- 2/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@@ -1293,15 -1267,13 +1309,15 @@@ static void nfit_test0_setup(struct nfi
        post_ars_status(&t->ars_state, t->spa_set_dma[0], SPA0_SIZE);
  
        acpi_desc = &t->acpi_desc;
-       set_bit(ND_CMD_GET_CONFIG_SIZE, &acpi_desc->dimm_dsm_force_en);
-       set_bit(ND_CMD_GET_CONFIG_DATA, &acpi_desc->dimm_dsm_force_en);
-       set_bit(ND_CMD_SET_CONFIG_DATA, &acpi_desc->dimm_dsm_force_en);
-       set_bit(ND_CMD_SMART, &acpi_desc->dimm_dsm_force_en);
-       set_bit(ND_CMD_ARS_CAP, &acpi_desc->bus_dsm_force_en);
-       set_bit(ND_CMD_ARS_START, &acpi_desc->bus_dsm_force_en);
-       set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_dsm_force_en);
-       set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_dsm_force_en);
-       set_bit(ND_CMD_SMART_THRESHOLD, &acpi_desc->dimm_dsm_force_en);
+       set_bit(ND_CMD_GET_CONFIG_SIZE, &acpi_desc->dimm_cmd_force_en);
+       set_bit(ND_CMD_GET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);
+       set_bit(ND_CMD_SET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);
++      set_bit(ND_CMD_SMART, &acpi_desc->dimm_cmd_force_en);
+       set_bit(ND_CMD_ARS_CAP, &acpi_desc->bus_cmd_force_en);
+       set_bit(ND_CMD_ARS_START, &acpi_desc->bus_cmd_force_en);
+       set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_cmd_force_en);
+       set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_cmd_force_en);
++      set_bit(ND_CMD_SMART_THRESHOLD, &acpi_desc->dimm_cmd_force_en);
  }
  
  static void nfit_test1_setup(struct nfit_test *t)