diff for duplicates of <20241118211900.3808-2-cel@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 5db221c..d19e1f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,36 +1,68 @@ -From: Dai Ngo <dai.ngo@oracle.com> +[ Sasha's backport helper bot ] -[ Upstream commit 15d1975b7279693d6f09398e0e2e31aca2310275 ] +Hi, -Prepare for adding server copy trace points. +The upstream commit SHA1 provided is correct: 15d1975b7279693d6f09398e0e2e31aca2310275 -Signed-off-by: Dai Ngo <dai.ngo@oracle.com> -Tested-by: Chen Hanxiao <chenhx.fnst@fujitsu.com> -Stable-dep-of: 9ed666eba4e0 ("NFSD: Async COPY result needs to return a write verifier") -Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +WARNING: Author mismatch between patch and upstream commit: +Backport author: cel@kernel.org +Commit author: Dai Ngo <dai.ngo@oracle.com> + +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (exact SHA1) | +| 6.6.y | Not found | +| 6.1.y | Not found | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: --- - fs/nfsd/nfs4proc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c -index df9dbd93663e..50f17cee8bcf 100644 ---- a/fs/nfsd/nfs4proc.c -+++ b/fs/nfsd/nfs4proc.c -@@ -1768,6 +1768,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, - __be32 status; - struct nfsd4_copy *async_copy = NULL; +--- - 2024-11-18 23:00:36.794064423 -0500 ++++ /tmp/tmp.6a2P3hH3a2 2024-11-18 23:00:36.786070330 -0500 +@@ -1,17 +1,20 @@ ++[ Upstream commit 15d1975b7279693d6f09398e0e2e31aca2310275 ] ++ + Prepare for adding server copy trace points. -+ copy->cp_clp = cstate->clp; - if (nfsd4_ssc_is_inter(copy)) { - if (!inter_copy_offload_enable || nfsd4_copy_is_sync(copy)) { - status = nfserr_notsupp; -@@ -1782,7 +1783,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, - return status; - } + Signed-off-by: Dai Ngo <dai.ngo@oracle.com> + Tested-by: Chen Hanxiao <chenhx.fnst@fujitsu.com> ++Stable-dep-of: 9ed666eba4e0 ("NFSD: Async COPY result needs to return a write verifier") + Signed-off-by: Chuck Lever <chuck.lever@oracle.com> + --- + fs/nfsd/nfs4proc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -- copy->cp_clp = cstate->clp; - memcpy(©->fh, &cstate->current_fh.fh_handle, - sizeof(struct knfsd_fh)); - if (nfsd4_copy_is_async(copy)) { --- -2.47.0 + diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c +-index 4199ede0583c7..c27f2fdcea32c 100644 ++index df9dbd93663e..50f17cee8bcf 100644 + --- a/fs/nfsd/nfs4proc.c + +++ b/fs/nfsd/nfs4proc.c +-@@ -1798,6 +1798,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ++@@ -1768,6 +1768,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + __be32 status; + struct nfsd4_copy *async_copy = NULL; + +@@ -19,7 +22,7 @@ + if (nfsd4_ssc_is_inter(copy)) { + if (!inter_copy_offload_enable || nfsd4_copy_is_sync(copy)) { + status = nfserr_notsupp; +-@@ -1812,7 +1813,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ++@@ -1782,7 +1783,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + return status; + } + +@@ -27,3 +30,6 @@ + memcpy(©->fh, &cstate->current_fh.fh_handle, + sizeof(struct knfsd_fh)); + if (nfsd4_copy_is_async(copy)) { ++-- ++2.47.0 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.1.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index e362b00..57ff1a8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,49 +1,78 @@ - "ref\020241118211900.3808-1-cel@kernel.org\0" - "From\0cel@kernel.org\0" - "Subject\0[PATCH 6.1 1/5] NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point\0" - "Date\0Mon, 18 Nov 2024 16:18:56 -0500\0" - "To\0<stable@vger.kernel.org>\0" - "Cc\0<linux-nfs@vger.kernel.org>" - Jeff Layton <jlayton@kernel.org> - Dai Ngo <dai.ngo@oracle.com> - " Chen Hanxiao <chenhx.fnst@fujitsu.com>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.1 1/5] NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point\0" + "Date\0Mon, 18 Nov 2024 23:36:15 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0cel@kernel.org" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Dai Ngo <dai.ngo@oracle.com>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "[ Upstream commit 15d1975b7279693d6f09398e0e2e31aca2310275 ]\n" + "Hi,\n" "\n" - "Prepare for adding server copy trace points.\n" + "The upstream commit SHA1 provided is correct: 15d1975b7279693d6f09398e0e2e31aca2310275\n" "\n" - "Signed-off-by: Dai Ngo <dai.ngo@oracle.com>\n" - "Tested-by: Chen Hanxiao <chenhx.fnst@fujitsu.com>\n" - "Stable-dep-of: 9ed666eba4e0 (\"NFSD: Async COPY result needs to return a write verifier\")\n" - "Signed-off-by: Chuck Lever <chuck.lever@oracle.com>\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: cel@kernel.org\n" + "Commit author: Dai Ngo <dai.ngo@oracle.com>\n" + "\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (exact SHA1) |\n" + "| 6.6.y | Not found |\n" + "| 6.1.y | Not found |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" "---\n" - " fs/nfsd/nfs4proc.c | 2 +-\n" - " 1 file changed, 1 insertion(+), 1 deletion(-)\n" - "\n" - "diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c\n" - "index df9dbd93663e..50f17cee8bcf 100644\n" - "--- a/fs/nfsd/nfs4proc.c\n" - "+++ b/fs/nfsd/nfs4proc.c\n" - "@@ -1768,6 +1768,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" - " \t__be32 status;\n" - " \tstruct nfsd4_copy *async_copy = NULL;\n" + "--- -\t2024-11-18 23:00:36.794064423 -0500\n" + "+++ /tmp/tmp.6a2P3hH3a2\t2024-11-18 23:00:36.786070330 -0500\n" + "@@ -1,17 +1,20 @@\n" + "+[ Upstream commit 15d1975b7279693d6f09398e0e2e31aca2310275 ]\n" + "+\n" + " Prepare for adding server copy trace points.\n" " \n" - "+\tcopy->cp_clp = cstate->clp;\n" - " \tif (nfsd4_ssc_is_inter(copy)) {\n" - " \t\tif (!inter_copy_offload_enable || nfsd4_copy_is_sync(copy)) {\n" - " \t\t\tstatus = nfserr_notsupp;\n" - "@@ -1782,7 +1783,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" - " \t\t\treturn status;\n" - " \t}\n" + " Signed-off-by: Dai Ngo <dai.ngo@oracle.com>\n" + " Tested-by: Chen Hanxiao <chenhx.fnst@fujitsu.com>\n" + "+Stable-dep-of: 9ed666eba4e0 (\"NFSD: Async COPY result needs to return a write verifier\")\n" + " Signed-off-by: Chuck Lever <chuck.lever@oracle.com>\n" + " ---\n" + " fs/nfsd/nfs4proc.c | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" " \n" - "-\tcopy->cp_clp = cstate->clp;\n" - " \tmemcpy(©->fh, &cstate->current_fh.fh_handle,\n" - " \t\tsizeof(struct knfsd_fh));\n" - " \tif (nfsd4_copy_is_async(copy)) {\n" - "-- \n" - 2.47.0 + " diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c\n" + "-index 4199ede0583c7..c27f2fdcea32c 100644\n" + "+index df9dbd93663e..50f17cee8bcf 100644\n" + " --- a/fs/nfsd/nfs4proc.c\n" + " +++ b/fs/nfsd/nfs4proc.c\n" + "-@@ -1798,6 +1798,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + "+@@ -1768,6 +1768,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + " \t__be32 status;\n" + " \tstruct nfsd4_copy *async_copy = NULL;\n" + " \n" + "@@ -19,7 +22,7 @@\n" + " \tif (nfsd4_ssc_is_inter(copy)) {\n" + " \t\tif (!inter_copy_offload_enable || nfsd4_copy_is_sync(copy)) {\n" + " \t\t\tstatus = nfserr_notsupp;\n" + "-@@ -1812,7 +1813,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + "+@@ -1782,7 +1783,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + " \t\t\treturn status;\n" + " \t}\n" + " \n" + "@@ -27,3 +30,6 @@\n" + " \tmemcpy(©->fh, &cstate->current_fh.fh_handle,\n" + " \t\tsizeof(struct knfsd_fh));\n" + " \tif (nfsd4_copy_is_async(copy)) {\n" + "+-- \n" + "+2.47.0\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.1.y | Success | Success | -995137983b8c8e7ed7c5d714163706d913305cdeec6046dc730545e647ec8c19 +0af0b0519982c59eb21cc9f0b146de8896fdfd4da523c2efb21cb9f58b6af41f
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.