On Mon, Sep 12, 2022 at 03:23:42PM -0700, Brian Norris wrote:
Hi Greg,
On Fri, Sep 9, 2022 at 11:31 AM gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Did something go wrong in your automation? The same patch applies cleanly to me (currently, on top of v5.15.67).
Possible dependencies:
47311db8e8f3 ("tracefs: Only clobber mode/uid/gid on remount if asked")
That's $subject patch. OK, so not that one.
851e99ebeec3 ("tracefs: Set the group ownership in apply_options() not parse_options()")
That one *is* a dependency, but it's already backported to 5.15.y as of several months ago:
commit 6db927ce66ac68bf732f0b14190791458e75047a Author: Steven Rostedt (Google) rostedt@goodmis.org AuthorDate: Fri Feb 25 15:34:26 2022 -0500 Commit: Greg Kroah-Hartman gregkh@linuxfoundation.org CommitDate: Wed Mar 2 11:48:05 2022 +0100
tracefs: Set the group ownership in apply_options() not parse_options() commit 851e99ebeec3f4a672bb5010cf1ece095acee447 upstream.So I'm not sure what to do to fix the backporting, other than ping back here.
I think the same applies to the 5.10.y rejection notice, and possibly a few others.
Here is what patch says:
Applying tracefs-only-clobber-mode-uid-gid-on-remount-if-asked.patch to linux-5.15.y Applying patch tracefs-only-clobber-mode-uid-gid-on-remount-if-asked.patch patching file fs/tracefs/inode.c Hunk #3 FAILED at 278. 1 out of 5 hunks FAILED -- rejects in file fs/tracefs/inode.c Patch tracefs-only-clobber-mode-uid-gid-on-remount-if-asked.patch does not apply (enforce with -f) quilt returned 1, with 0 fuzz and 1 rejects
How did you apply the patch to 5.15.y that worked?
thanks,
greg k-h