diff for duplicates of <20190520172552.217253-7-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index ced9b79..ff528b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -320,8 +320,8 @@ index 0000000000000..481916013c713 + + keyref = keyring_search(keyref, type, description); + if (IS_ERR(keyref)) { -+ if (PTR_ERR(keyref) = -EAGAIN || /* not found */ -+ PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */ ++ if (PTR_ERR(keyref) == -EAGAIN || /* not found */ ++ PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */ + keyref = ERR_PTR(-ENOKEY); + return ERR_CAST(keyref); + } @@ -388,7 +388,7 @@ index 0000000000000..481916013c713 + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = READ_ONCE(sb->s_master_keys); -+ if (keyring = NULL) ++ if (keyring == NULL) + return ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */ + + format_mk_description(description, mk_spec); diff --git a/a/content_digest b/N1/content_digest index 076c23a..d2a7f2d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:42 +0000\0" + "Date\0Mon, 20 May 2019 10:25:42 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -336,8 +336,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description);\n" "+\tif (IS_ERR(keyref)) {\n" - "+\t\tif (PTR_ERR(keyref) = -EAGAIN || /* not found */\n" - "+\t\t PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */\n" + "+\t\tif (PTR_ERR(keyref) == -EAGAIN || /* not found */\n" + "+\t\t PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */\n" "+\t\t\tkeyref = ERR_PTR(-ENOKEY);\n" "+\t\treturn ERR_CAST(keyref);\n" "+\t}\n" @@ -404,7 +404,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = READ_ONCE(sb->s_master_keys);\n" - "+\tif (keyring = NULL)\n" + "+\tif (keyring == NULL)\n" "+\t\treturn ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */\n" "+\n" "+\tformat_mk_description(description, mk_spec);\n" @@ -702,4 +702,4 @@ "-- \n" 2.21.0.1020.gf2820cf01a-goog -b487c7f42cb5efda92cb033e60c6f44b7abe3244e463830c535cddfc88e6c067 +5a113de3b2f92d5f70edf783b92d71ee48f30a052f0c0ece8e8258687ee87415
diff --git a/a/1.txt b/N2/1.txt index ced9b79..ff528b0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -320,8 +320,8 @@ index 0000000000000..481916013c713 + + keyref = keyring_search(keyref, type, description); + if (IS_ERR(keyref)) { -+ if (PTR_ERR(keyref) = -EAGAIN || /* not found */ -+ PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */ ++ if (PTR_ERR(keyref) == -EAGAIN || /* not found */ ++ PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */ + keyref = ERR_PTR(-ENOKEY); + return ERR_CAST(keyref); + } @@ -388,7 +388,7 @@ index 0000000000000..481916013c713 + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = READ_ONCE(sb->s_master_keys); -+ if (keyring = NULL) ++ if (keyring == NULL) + return ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */ + + format_mk_description(description, mk_spec); diff --git a/a/content_digest b/N2/content_digest index 076c23a..6ec7328 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:42 +0000\0" + "Date\0Mon, 20 May 2019 10:25:42 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0linux-ext4@vger.kernel.org" + "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org linux-f2fs-devel@lists.sourceforge.net keyrings@vger.kernel.org linux-mtd@lists.infradead.org linux-crypto@vger.kernel.org linux-fsdevel@vger.kernel.org - Satya Tangirala <satyat@google.com> + linux-ext4@vger.kernel.org " Paul Crowley <paulcrowley@google.com>\0" "\00:1\0" "b\0" @@ -336,8 +336,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description);\n" "+\tif (IS_ERR(keyref)) {\n" - "+\t\tif (PTR_ERR(keyref) = -EAGAIN || /* not found */\n" - "+\t\t PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */\n" + "+\t\tif (PTR_ERR(keyref) == -EAGAIN || /* not found */\n" + "+\t\t PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */\n" "+\t\t\tkeyref = ERR_PTR(-ENOKEY);\n" "+\t\treturn ERR_CAST(keyref);\n" "+\t}\n" @@ -404,7 +404,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = READ_ONCE(sb->s_master_keys);\n" - "+\tif (keyring = NULL)\n" + "+\tif (keyring == NULL)\n" "+\t\treturn ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */\n" "+\n" "+\tformat_mk_description(description, mk_spec);\n" @@ -702,4 +702,4 @@ "-- \n" 2.21.0.1020.gf2820cf01a-goog -b487c7f42cb5efda92cb033e60c6f44b7abe3244e463830c535cddfc88e6c067 +ecac0ec8ad123715af92161c5b90d29935b5b77c8fcfd159a44c851d0398604b
diff --git a/a/1.txt b/N3/1.txt index ced9b79..b512b9b 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -320,8 +320,8 @@ index 0000000000000..481916013c713 + + keyref = keyring_search(keyref, type, description); + if (IS_ERR(keyref)) { -+ if (PTR_ERR(keyref) = -EAGAIN || /* not found */ -+ PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */ ++ if (PTR_ERR(keyref) == -EAGAIN || /* not found */ ++ PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */ + keyref = ERR_PTR(-ENOKEY); + return ERR_CAST(keyref); + } @@ -388,7 +388,7 @@ index 0000000000000..481916013c713 + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = READ_ONCE(sb->s_master_keys); -+ if (keyring = NULL) ++ if (keyring == NULL) + return ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */ + + format_mk_description(description, mk_spec); @@ -685,3 +685,10 @@ index 3bbc5dfbde211..7bed24632bda7 100644 /* old names; don't add anything new here! */ -- 2.21.0.1020.gf2820cf01a-goog + + + +_______________________________________________ +Linux-f2fs-devel mailing list +Linux-f2fs-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel diff --git a/a/content_digest b/N3/content_digest index 076c23a..a656591 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[PATCH v6 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:42 +0000\0" + "Subject\0[f2fs-dev] [PATCH v6 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" + "Date\0Mon, 20 May 2019 10:25:42 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -336,8 +336,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description);\n" "+\tif (IS_ERR(keyref)) {\n" - "+\t\tif (PTR_ERR(keyref) = -EAGAIN || /* not found */\n" - "+\t\t PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */\n" + "+\t\tif (PTR_ERR(keyref) == -EAGAIN || /* not found */\n" + "+\t\t PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */\n" "+\t\t\tkeyref = ERR_PTR(-ENOKEY);\n" "+\t\treturn ERR_CAST(keyref);\n" "+\t}\n" @@ -404,7 +404,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = READ_ONCE(sb->s_master_keys);\n" - "+\tif (keyring = NULL)\n" + "+\tif (keyring == NULL)\n" "+\t\treturn ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */\n" "+\n" "+\tformat_mk_description(description, mk_spec);\n" @@ -700,6 +700,13 @@ " \n" " /* old names; don't add anything new here! */\n" "-- \n" - 2.21.0.1020.gf2820cf01a-goog + "2.21.0.1020.gf2820cf01a-goog\n" + "\n" + "\n" + "\n" + "_______________________________________________\n" + "Linux-f2fs-devel mailing list\n" + "Linux-f2fs-devel@lists.sourceforge.net\n" + https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel -b487c7f42cb5efda92cb033e60c6f44b7abe3244e463830c535cddfc88e6c067 +aa6bc49f338b4fccdb54b4d5fbdf2620864744d9b76b5a825034a8abe0157622
diff --git a/a/1.txt b/N4/1.txt index ced9b79..1730ba2 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -320,8 +320,8 @@ index 0000000000000..481916013c713 + + keyref = keyring_search(keyref, type, description); + if (IS_ERR(keyref)) { -+ if (PTR_ERR(keyref) = -EAGAIN || /* not found */ -+ PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */ ++ if (PTR_ERR(keyref) == -EAGAIN || /* not found */ ++ PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */ + keyref = ERR_PTR(-ENOKEY); + return ERR_CAST(keyref); + } @@ -388,7 +388,7 @@ index 0000000000000..481916013c713 + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = READ_ONCE(sb->s_master_keys); -+ if (keyring = NULL) ++ if (keyring == NULL) + return ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */ + + format_mk_description(description, mk_spec); @@ -685,3 +685,8 @@ index 3bbc5dfbde211..7bed24632bda7 100644 /* old names; don't add anything new here! */ -- 2.21.0.1020.gf2820cf01a-goog + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N4/content_digest index 076c23a..33de523 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190520172552.217253-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v6 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 20 May 2019 17:25:42 +0000\0" + "Date\0Mon, 20 May 2019 10:25:42 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -336,8 +336,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description);\n" "+\tif (IS_ERR(keyref)) {\n" - "+\t\tif (PTR_ERR(keyref) = -EAGAIN || /* not found */\n" - "+\t\t PTR_ERR(keyref) = -EKEYREVOKED) /* recently invalidated */\n" + "+\t\tif (PTR_ERR(keyref) == -EAGAIN || /* not found */\n" + "+\t\t PTR_ERR(keyref) == -EKEYREVOKED) /* recently invalidated */\n" "+\t\t\tkeyref = ERR_PTR(-ENOKEY);\n" "+\t\treturn ERR_CAST(keyref);\n" "+\t}\n" @@ -404,7 +404,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = READ_ONCE(sb->s_master_keys);\n" - "+\tif (keyring = NULL)\n" + "+\tif (keyring == NULL)\n" "+\t\treturn ERR_PTR(-ENOKEY); /* No keyring yet, so no keys yet. */\n" "+\n" "+\tformat_mk_description(description, mk_spec);\n" @@ -700,6 +700,11 @@ " \n" " /* old names; don't add anything new here! */\n" "-- \n" - 2.21.0.1020.gf2820cf01a-goog + "2.21.0.1020.gf2820cf01a-goog\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -b487c7f42cb5efda92cb033e60c6f44b7abe3244e463830c535cddfc88e6c067 +9e971afcb06696077c60b4fa81c0142fbdf59e84456ffcf94951a9eac1ef9488
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.