diff for duplicates of <20190220065249.32099-8-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 5d275f6..f8fc95b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -315,8 +315,8 @@ index 000000000000..d44d595b2fd0 + + 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..d44d595b2fd0 + + /* 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 afafd09..db39417 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 07/18] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 20 Feb 2019 06:52:38 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:38 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" 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 -d0a4a2d9b0e37e0bb12bd10287194438a8582ab02955e4fc1d688c9a711deb6f +def28a0083b965055e84ff4bf52e2894e7590a2bfd3b7fde2e5581c0a53a902e
diff --git a/a/1.txt b/N2/1.txt index 5d275f6..f8fc95b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -315,8 +315,8 @@ index 000000000000..d44d595b2fd0 + + 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..d44d595b2fd0 + + /* 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 afafd09..b9f2f93 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 07/18] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 20 Feb 2019 06:52:38 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:38 -0800\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" @@ -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 -d0a4a2d9b0e37e0bb12bd10287194438a8582ab02955e4fc1d688c9a711deb6f +9eb6ae151ca564563653bca644052c895449ccf09219b80f6b848c79367654bb
diff --git a/a/1.txt b/N3/1.txt index 5d275f6..918722d 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -315,8 +315,8 @@ index 000000000000..d44d595b2fd0 + + 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..d44d595b2fd0 + + /* 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 afafd09..8eea49d 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0[RFC PATCH v3 07/18] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 20 Feb 2019 06:52:38 +0000\0" + "Subject\0[f2fs-dev] [RFC PATCH v3 07/18] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" + "Date\0Tue, 19 Feb 2019 22:52:38 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" 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 -d0a4a2d9b0e37e0bb12bd10287194438a8582ab02955e4fc1d688c9a711deb6f +05c65c57a029118448bf6686d557874f26883b942bbccbd03fff0e0dfcf467bc
diff --git a/a/1.txt b/N4/1.txt index 5d275f6..fea1f1e 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -315,8 +315,8 @@ index 000000000000..d44d595b2fd0 + + 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..d44d595b2fd0 + + /* 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 afafd09..790f4a8 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 07/18] fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl\0" - "Date\0Wed, 20 Feb 2019 06:52:38 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:38 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" 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/ -d0a4a2d9b0e37e0bb12bd10287194438a8582ab02955e4fc1d688c9a711deb6f +322a749d66f1e692e9795324c21e6963d53f5e257f2dccbaa1f19d1c9f6e4077
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.