diff for duplicates of <153549646600.4089.2626014553500613547.stgit@djiang5-desk3.ch.intel.com>
diff --git a/a/1.txt b/N1/1.txt
index 47c9194..be09c74 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -141,10 +141,8 @@ index 000000000000..4bfc1c1da339
+ .nd_command = NVDIMM_INTEL_GET_SECURITY_STATE,
+ .nd_family = NVDIMM_FAMILY_INTEL,
+ .nd_size_in = 0,
-+ .nd_size_out =
-+ sizeof(struct nd_intel_get_security_state),
-+ .nd_fw_size =
-+ sizeof(struct nd_intel_get_security_state),
++ .nd_size_out + sizeof(struct nd_intel_get_security_state),
++ .nd_fw_size + sizeof(struct nd_intel_get_security_state),
+ },
+ .cmd = {
+ .status = 0,
@@ -318,10 +316,10 @@ index e753b2095402..fe61f2a2ad5d 100644
+
+static int nvdimm_check_key_len(unsigned short len, bool update)
+{
-+ if (len == (NVDIMM_PASSPHRASE_LEN * 2) && update)
++ if (len = (NVDIMM_PASSPHRASE_LEN * 2) && update)
+ return 0;
+
-+ if (len == NVDIMM_PASSPHRASE_LEN)
++ if (len = NVDIMM_PASSPHRASE_LEN)
+ return 0;
+
+ return -EINVAL;
@@ -351,9 +349,9 @@ index e753b2095402..fe61f2a2ad5d 100644
+ if (!nvdimm->security_ops)
+ return 0;
+
-+ if (nvdimm->state == NVDIMM_SECURITY_UNLOCKED ||
-+ nvdimm->state == NVDIMM_SECURITY_UNSUPPORTED ||
-+ nvdimm->state == NVDIMM_SECURITY_DISABLED)
++ if (nvdimm->state = NVDIMM_SECURITY_UNLOCKED ||
++ nvdimm->state = NVDIMM_SECURITY_UNSUPPORTED ||
++ nvdimm->state = NVDIMM_SECURITY_DISABLED)
+ return 0;
+
+ key = nvdimm_get_key(dev);
@@ -380,7 +378,7 @@ index e753b2095402..fe61f2a2ad5d 100644
+ (const void *)payload->data);
+ up_read(&key->sem);
+
-+ if (rc == 0) {
++ if (rc = 0) {
+ if (!cached_key) {
+ key_link(nvdimm_keyring, key);
+ nvdimm->key = key;
@@ -498,9 +496,4 @@ index 3c1f18fdf76f..257ff2637ce1 100644
+ const struct nvdimm_security_ops *sec_ops);
const struct nd_cmd_desc *nd_cmd_dimm_desc(int cmd);
const struct nd_cmd_desc *nd_cmd_bus_desc(int cmd);
- u32 nd_cmd_in_size(struct nvdimm *nvdimm, int cmd,
-
-_______________________________________________
-Linux-nvdimm mailing list
-Linux-nvdimm@lists.01.org
-https://lists.01.org/mailman/listinfo/linux-nvdimm
\ No newline at end of file
+ u32 nd_cmd_in_size(struct nvdimm *nvdimm, int cmd,
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 744bcda..c2aea9a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v8 05/12] nfit/libnvdimm: add unlock of nvdimm support for Intel DIMMs\0"
]
[
- "Date\0Tue, 28 Aug 2018 15:47:46 -0700\0"
+ "Date\0Tue, 28 Aug 2018 22:47:46 +0000\0"
]
[
"To\0linux-nvdimm\@lists.01.org\0"
@@ -170,10 +170,8 @@
"+\t\t\t.nd_command = NVDIMM_INTEL_GET_SECURITY_STATE,\n",
"+\t\t\t.nd_family = NVDIMM_FAMILY_INTEL,\n",
"+\t\t\t.nd_size_in = 0,\n",
- "+\t\t\t.nd_size_out =\n",
- "+\t\t\t\tsizeof(struct nd_intel_get_security_state),\n",
- "+\t\t\t.nd_fw_size =\n",
- "+\t\t\t\tsizeof(struct nd_intel_get_security_state),\n",
+ "+\t\t\t.nd_size_out +\t\t\t\tsizeof(struct nd_intel_get_security_state),\n",
+ "+\t\t\t.nd_fw_size +\t\t\t\tsizeof(struct nd_intel_get_security_state),\n",
"+\t\t},\n",
"+\t\t.cmd = {\n",
"+\t\t\t.status = 0,\n",
@@ -347,10 +345,10 @@
"+\n",
"+static int nvdimm_check_key_len(unsigned short len, bool update)\n",
"+{\n",
- "+\tif (len == (NVDIMM_PASSPHRASE_LEN * 2) && update)\n",
+ "+\tif (len = (NVDIMM_PASSPHRASE_LEN * 2) && update)\n",
"+\t\treturn 0;\n",
"+\n",
- "+\tif (len == NVDIMM_PASSPHRASE_LEN)\n",
+ "+\tif (len = NVDIMM_PASSPHRASE_LEN)\n",
"+\t\treturn 0;\n",
"+\n",
"+\treturn -EINVAL;\n",
@@ -380,9 +378,9 @@
"+\tif (!nvdimm->security_ops)\n",
"+\t\treturn 0;\n",
"+\n",
- "+\tif (nvdimm->state == NVDIMM_SECURITY_UNLOCKED ||\n",
- "+\t\t\tnvdimm->state == NVDIMM_SECURITY_UNSUPPORTED ||\n",
- "+\t\t\tnvdimm->state == NVDIMM_SECURITY_DISABLED)\n",
+ "+\tif (nvdimm->state = NVDIMM_SECURITY_UNLOCKED ||\n",
+ "+\t\t\tnvdimm->state = NVDIMM_SECURITY_UNSUPPORTED ||\n",
+ "+\t\t\tnvdimm->state = NVDIMM_SECURITY_DISABLED)\n",
"+\t\treturn 0;\n",
"+\n",
"+\tkey = nvdimm_get_key(dev);\n",
@@ -409,7 +407,7 @@
"+\t\t\t(const void *)payload->data);\n",
"+\tup_read(&key->sem);\n",
"+\n",
- "+\tif (rc == 0) {\n",
+ "+\tif (rc = 0) {\n",
"+\t\tif (!cached_key) {\n",
"+\t\t\tkey_link(nvdimm_keyring, key);\n",
"+\t\t\tnvdimm->key = key;\n",
@@ -527,12 +525,7 @@
"+\t\tconst struct nvdimm_security_ops *sec_ops);\n",
" const struct nd_cmd_desc *nd_cmd_dimm_desc(int cmd);\n",
" const struct nd_cmd_desc *nd_cmd_bus_desc(int cmd);\n",
- " u32 nd_cmd_in_size(struct nvdimm *nvdimm, int cmd,\n",
- "\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list\n",
- "Linux-nvdimm\@lists.01.org\n",
- "https://lists.01.org/mailman/listinfo/linux-nvdimm"
+ " u32 nd_cmd_in_size(struct nvdimm *nvdimm, int cmd,"
]
-b72fbfd9e05d357fc3af5fa43f0a6612f9c7cfa6acfcf8f8ddf9d5f76ea81e41
+3570d471534a5354704778e5186e9f9b043b3e2c51d534b0d26e97fbe0f0eafb
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.