From: Greg KH <gregkh@linuxfoundation.org>
To: Jani Nikula <jani.nikula@intel.com>
Cc: andrzej.hajda@intel.com, luciano.coelho@intel.com,
matthew.d.roper@intel.com, rodrigo.vivi@intel.com,
stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] drm/i915: fix display probe for IVB Q and IVB D GT2 server" failed to apply to 6.4-stable tree
Date: Sun, 27 Aug 2023 09:17:35 +0200 [thread overview]
Message-ID: <2023082728-crayfish-grandkid-213e@gregkh> (raw)
In-Reply-To: <87cyzf7aai.fsf@intel.com>
On Tue, Aug 22, 2023 at 11:26:13AM +0300, Jani Nikula wrote:
> On Mon, 21 Aug 2023, <gregkh@linuxfoundation.org> wrote:
> > The patch below does not apply to the 6.4-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.4.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 423ffe62c06ae241ad460f4629dddb9dcf55e060
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023082143-rummage-chasing-3ff3@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
> >
> > Possible dependencies:
>
> I think it should work to cherry-pick this as the dependency:
>
> 12e6f6dc78e4 ("drm/i915/display: Handle GMD_ID identification in display code")
That worked, thanks!
greg k-h
prev parent reply other threads:[~2023-08-27 7:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-21 17:04 FAILED: patch "[PATCH] drm/i915: fix display probe for IVB Q and IVB D GT2 server" failed to apply to 6.4-stable tree gregkh
2023-08-22 8:26 ` Jani Nikula
2023-08-27 7:17 ` 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=2023082728-crayfish-grandkid-213e@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=andrzej.hajda@intel.com \
--cc=jani.nikula@intel.com \
--cc=luciano.coelho@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=rodrigo.vivi@intel.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