public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Amir Goldstein <amir73il@gmail.com>
Cc: feilv@asrmicro.com, chenglongtang@google.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] ovl: make fsync after metadata copy-up opt-in mount option" failed to apply to 6.12-stable tree
Date: Tue, 31 Mar 2026 13:02:00 +0200	[thread overview]
Message-ID: <2026033156-delicious-bagful-4526@gregkh> (raw)
In-Reply-To: <CAOQ4uxgY733g8UzJTcEcGPPYO2yL93jtTXsuFZsJSxj=cBUb+A@mail.gmail.com>

On Mon, Mar 30, 2026 at 05:25:46PM +0200, Amir Goldstein wrote:
> On Mon, Mar 30, 2026 at 4:52 PM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Mon, Mar 30, 2026 at 04:15:48PM +0200, Amir Goldstein wrote:
> > > On Mon, Mar 30, 2026 at 11:36 AM <gregkh@linuxfoundation.org> wrote:
> > > >
> > > >
> > > > The patch below does not apply to the 6.12-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>.
> > > >
> > > > To reproduce the conflict and resubmit, you may use the following commands:
> > > >
> > > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
> > > > git checkout FETCH_HEAD
> > > > git cherry-pick -x 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95
> > > > # <resolve conflicts, build, test, etc.>
> > > > git commit -s
> > > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026033031-backpack-decorator-faaa@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> > > >
> > > > Possible dependencies:
> > > >
> > >
> > > Please apply this dependency patch as described in commit message:
> > >
> > > Depends: 50e638beb67e0 ("ovl: Use str_on_off() helper in ovl_show_options()")
> > >
> > > Should I describe the dependency using a different format in the future for
> > > the scripts to catch it?
> >
> > Yes, please use the way it is documented in:
> >     https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> >
> 
> Very well, I will keep that in mind.
> For now, going with "Option 2":
> 
> Please apply
> 50e638beb67e0 ("ovl: Use str_on_off() helper in ovl_show_options()")
> to 6.12.y. It is a trivial cleanup patch and it will allow a clean apply of
> $SUBJECT fix to 6.12.y.

That worked, thanks!

greg k-h

      reply	other threads:[~2026-03-31 11:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-30  9:36 FAILED: patch "[PATCH] ovl: make fsync after metadata copy-up opt-in mount option" failed to apply to 6.12-stable tree gregkh
2026-03-30 14:15 ` Amir Goldstein
2026-03-30 14:52   ` Greg KH
2026-03-30 15:25     ` Amir Goldstein
2026-03-31 11:02       ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2026033156-delicious-bagful-4526@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=amir73il@gmail.com \
    --cc=chenglongtang@google.com \
    --cc=feilv@asrmicro.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox