diff for duplicates of <20190211172738.4633-8-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 00bd642..fb07ffa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -315,8 +315,8 @@ index 000000000000..252e863d681d + + 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); + } @@ -377,7 +377,7 @@ index 000000000000..252e863d681d + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = smp_load_acquire(&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 25978b0..3ffcfd0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v2 07/20] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:25 +0000\0" + "Date\0Mon, 11 Feb 2019 09:27:25 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -331,8 +331,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" @@ -393,7 +393,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = smp_load_acquire(&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" @@ -654,4 +654,4 @@ "-- \n" 2.20.1 -ed9bfbc28cccf683dec8b4db96d5a94d314470eb849344600bb0cf6d43fdb616 +6f96359913c68552f19fc7a667851147f3b907c6e1cf9fbcf851122e28054225
diff --git a/a/1.txt b/N2/1.txt index 00bd642..fb07ffa 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -315,8 +315,8 @@ index 000000000000..252e863d681d + + 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); + } @@ -377,7 +377,7 @@ index 000000000000..252e863d681d + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = smp_load_acquire(&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 25978b0..a54d5ec 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v2 07/20] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:25 +0000\0" + "Date\0Mon, 11 Feb 2019 09:27:25 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0Satya Tangirala <satyat@google.com>" - linux-api@vger.kernel.org + "Cc\0linux-ext4@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 - linux-ext4@vger.kernel.org + linux-crypto@vger.kernel.org + linux-api@vger.kernel.org + keyrings@vger.kernel.org + Satya Tangirala <satyat@google.com> " Paul Crowley <paulcrowley@google.com>\0" "\00:1\0" "b\0" @@ -331,8 +331,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" @@ -393,7 +393,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = smp_load_acquire(&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" @@ -654,4 +654,4 @@ "-- \n" 2.20.1 -ed9bfbc28cccf683dec8b4db96d5a94d314470eb849344600bb0cf6d43fdb616 +1928abb477d919169387d23ed87d171cf2974e4cb7ba3518b91686243b11bac2
diff --git a/a/1.txt b/N3/1.txt index 00bd642..3803e2e 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -315,8 +315,8 @@ index 000000000000..252e863d681d + + 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); + } @@ -377,7 +377,7 @@ index 000000000000..252e863d681d + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = smp_load_acquire(&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); @@ -637,3 +637,10 @@ index 3bbc5dfbde21..7bed24632bda 100644 /* old names; don't add anything new here! */ -- 2.20.1 + + + +_______________________________________________ +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 25978b0..7806d1e 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[RFC PATCH v2 07/20] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:25 +0000\0" + "Subject\0[f2fs-dev] [RFC PATCH v2 07/20] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" + "Date\0Mon, 11 Feb 2019 09:27:25 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -331,8 +331,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" @@ -393,7 +393,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = smp_load_acquire(&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" @@ -652,6 +652,13 @@ " \n" " /* old names; don't add anything new here! */\n" "-- \n" - 2.20.1 + "2.20.1\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 -ed9bfbc28cccf683dec8b4db96d5a94d314470eb849344600bb0cf6d43fdb616 +6c9815af256390e4c742774727aee5fd26b7ffd6d9e775864ea1ace7bd205628
diff --git a/a/1.txt b/N4/1.txt index 00bd642..3d89046 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -315,8 +315,8 @@ index 000000000000..252e863d681d + + 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); + } @@ -377,7 +377,7 @@ index 000000000000..252e863d681d + + /* pairs with smp_store_release() in allocate_filesystem_keyring() */ + keyring = smp_load_acquire(&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); @@ -637,3 +637,8 @@ index 3bbc5dfbde21..7bed24632bda 100644 /* old names; don't add anything new here! */ -- 2.20.1 + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N4/content_digest index 25978b0..c341db6 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190211172738.4633-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v2 07/20] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Mon, 11 Feb 2019 17:27:25 +0000\0" + "Date\0Mon, 11 Feb 2019 09:27:25 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -331,8 +331,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" @@ -393,7 +393,7 @@ "+\n" "+\t/* pairs with smp_store_release() in allocate_filesystem_keyring() */\n" "+\tkeyring = smp_load_acquire(&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" @@ -652,6 +652,11 @@ " \n" " /* old names; don't add anything new here! */\n" "-- \n" - 2.20.1 + "2.20.1\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -ed9bfbc28cccf683dec8b4db96d5a94d314470eb849344600bb0cf6d43fdb616 +b870030664facc60a19321a6b9d655a4fbdcd4e159866aa9b3821134e0abbf62
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.