From: Greg KH <gregkh@linuxfoundation.org>
To: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
Cc: umesh.nerlige.ramappa@intel.com, jonathan.cavitt@intel.com,
matthew.brost@intel.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] xe/oa: Fix query mode of operation for OAR/OAC" failed to apply to 6.12-stable tree
Date: Tue, 11 Feb 2025 11:31:10 +0100 [thread overview]
Message-ID: <2025021105-superman-glory-06e3@gregkh> (raw)
In-Reply-To: <85jz9x3413.wl-ashutosh.dixit@intel.com>
On Mon, Feb 10, 2025 at 01:04:24PM -0800, Dixit, Ashutosh wrote:
> On Mon, 10 Feb 2025 05:02:13 -0800, <gregkh@linuxfoundation.org> wrote:
> >
>
> Hi Greg,
>
> >
> > 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 55039832f98c7e05f1cf9e0d8c12b2490abd0f16
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025021013-cavalry-unsightly-0671@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> >
> > Possible dependencies:
>
> We had submitted a modified version of the patch, adapted for 6.12 here:
>
> https://lore.kernel.org/stable/20250110205341.199539-1-umesh.nerlige.ramappa@intel.com/
As it came in before this hit Linus's tree, (remember, you referenced a
commit that was in 6.14-rc1 here, which is NOT what I think you wanted,
right?), it was dropped.
> Please take this patch for 6.12.
Can you please resend this? It's long gone from my mboxes.
thanks,
greg k-h
next prev parent reply other threads:[~2025-02-11 10:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-10 13:02 FAILED: patch "[PATCH] xe/oa: Fix query mode of operation for OAR/OAC" failed to apply to 6.12-stable tree gregkh
2025-02-10 21:04 ` Dixit, Ashutosh
2025-02-11 10:31 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 10:06 gregkh
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=2025021105-superman-glory-06e3@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=ashutosh.dixit@intel.com \
--cc=jonathan.cavitt@intel.com \
--cc=matthew.brost@intel.com \
--cc=stable@vger.kernel.org \
--cc=umesh.nerlige.ramappa@intel.com \
/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