On Tue, Sep 13, 2022 at 4:34 AM Greg Kroah-Hartman gregkh@linuxfoundation.org wrote:
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?
Hmm, I suppose I have 'git am' doing 3-way merges for me, which resolve OK:
$ curl https://lore.kernel.org/all/166274826116451@kroah.com/raw | git am - % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 6614 100 6614 0 0 27768 0 --:--:-- --:--:-- --:--:-- 27789 Applying: FAILED: patch "[PATCH] tracefs: Only clobber mode/uid/gid on remount if asked" failed to apply to 5.15-stable tree Using index info to reconstruct a base tree... M fs/tracefs/inode.c Falling back to patching base and 3-way merge... Auto-merging fs/tracefs/inode.c
And originally, I guess I was testing 'git cherry-pick', not literally this patch. That also does some "auto-merging":
$ git cherry-pick 47311db8e8f33011d90dee76b39c8886120cdda4 Auto-merging fs/tracefs/inode.c [detached HEAD e9f574cc9df9] tracefs: Only clobber mode/uid/gid on remount if asked Date: Fri Aug 26 17:44:17 2022 -0700 1 file changed, 23 insertions(+), 8 deletions(-)
I'll generate a clean patch based on the above, but it'll look awfully similar. (I think there's a single line of context that looks different, a few lines away.) Stay tuned.
Brian