diff for duplicates of <20190726224141.14044-7-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 43329cc..1528da0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -310,8 +310,8 @@ index 0000000000000..bd489433bba04 + + keyref = keyring_search(keyref, type, description, false); + 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); + } @@ -378,7 +378,7 @@ index 0000000000000..bd489433bba04 + + /* 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 cc022c4..f2b6acf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190726224141.14044-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v7 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Fri, 26 Jul 2019 22:41:31 +0000\0" + "Date\0Fri, 26 Jul 2019 15:41:31 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -326,8 +326,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description, false);\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" @@ -394,7 +394,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" @@ -687,4 +687,4 @@ "-- \n" 2.22.0 -3849bb07a78c1eb6b13646f0a8ff4a4b851d31e06716034833a7ddbc9432b211 +7476f6c7c10d2adf4bd1db3824b7910c0a8e002ffb20824f7940f81a6c670980
diff --git a/a/1.txt b/N2/1.txt index 43329cc..1528da0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -310,8 +310,8 @@ index 0000000000000..bd489433bba04 + + keyref = keyring_search(keyref, type, description, false); + 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); + } @@ -378,7 +378,7 @@ index 0000000000000..bd489433bba04 + + /* 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 cc022c4..01cbd7e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,17 @@ "ref\020190726224141.14044-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v7 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Fri, 26 Jul 2019 22:41:31 +0000\0" + "Date\0Fri, 26 Jul 2019 15:41:31 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0Satya Tangirala <satyat@google.com>" - linux-api@vger.kernel.org + "Cc\0linux-fsdevel@vger.kernel.org" + linux-ext4@vger.kernel.org linux-f2fs-devel@lists.sourceforge.net - keyrings@vger.kernel.org linux-mtd@lists.infradead.org + linux-api@vger.kernel.org linux-crypto@vger.kernel.org - linux-fsdevel@vger.kernel.org - linux-ext4@vger.kernel.org - " Paul Crowley <paulcrowley@google.com>\0" + keyrings@vger.kernel.org + Paul Crowley <paulcrowley@google.com> + " Satya Tangirala <satyat@google.com>\0" "\00:1\0" "b\0" "From: Eric Biggers <ebiggers@google.com>\n" @@ -326,8 +326,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description, false);\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" @@ -394,7 +394,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" @@ -687,4 +687,4 @@ "-- \n" 2.22.0 -3849bb07a78c1eb6b13646f0a8ff4a4b851d31e06716034833a7ddbc9432b211 +1ac65d4c9f8270d2f41455d187faa92c707fa3be0d17f74624e1773fe7f38c0d
diff --git a/a/1.txt b/N3/1.txt index 43329cc..cadd47f 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -310,8 +310,8 @@ index 0000000000000..bd489433bba04 + + keyref = keyring_search(keyref, type, description, false); + 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); + } @@ -378,7 +378,7 @@ index 0000000000000..bd489433bba04 + + /* 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); @@ -670,3 +670,10 @@ index 29a945d165def..93d6eabaa7de4 100644 /* old names; don't add anything new here! */ -- 2.22.0 + + + +_______________________________________________ +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 cc022c4..8dc06d1 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190726224141.14044-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[PATCH v7 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Fri, 26 Jul 2019 22:41:31 +0000\0" + "Subject\0[f2fs-dev] [PATCH v7 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" + "Date\0Fri, 26 Jul 2019 15:41:31 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -326,8 +326,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description, false);\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" @@ -394,7 +394,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" @@ -685,6 +685,13 @@ " \n" " /* old names; don't add anything new here! */\n" "-- \n" - 2.22.0 + "2.22.0\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 -3849bb07a78c1eb6b13646f0a8ff4a4b851d31e06716034833a7ddbc9432b211 +cd5260c574b7fc1ea474b26e07ebf59a01865731830e5f274a47d8f49a49acab
diff --git a/a/1.txt b/N4/1.txt index 43329cc..00d134a 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -310,8 +310,8 @@ index 0000000000000..bd489433bba04 + + keyref = keyring_search(keyref, type, description, false); + 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); + } @@ -378,7 +378,7 @@ index 0000000000000..bd489433bba04 + + /* 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); @@ -670,3 +670,8 @@ index 29a945d165def..93d6eabaa7de4 100644 /* old names; don't add anything new here! */ -- 2.22.0 + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N4/content_digest index cc022c4..6790527 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190726224141.14044-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v7 06/16] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Fri, 26 Jul 2019 22:41:31 +0000\0" + "Date\0Fri, 26 Jul 2019 15:41:31 -0700\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -326,8 +326,8 @@ "+\n" "+\tkeyref = keyring_search(keyref, type, description, false);\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" @@ -394,7 +394,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" @@ -685,6 +685,11 @@ " \n" " /* old names; don't add anything new here! */\n" "-- \n" - 2.22.0 + "2.22.0\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -3849bb07a78c1eb6b13646f0a8ff4a4b851d31e06716034833a7ddbc9432b211 +2b3c872a4739daa8f059cc36df2ccfa6daaabf964e2d5816dea390ac6bb0ba41
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.