Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Janne Grunau <j@jannau.net>
Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] drm: Select DRM_KMS_HELPER from" failed to apply to 6.6-stable tree
Date: Mon, 5 May 2025 10:49:57 +0200	[thread overview]
Message-ID: <2025050530-monotype-eligibly-e5b1@gregkh> (raw)
In-Reply-To: <7cb8c3e1-52c3-498f-92af-b8b61a2ce8e8@app.fastmail.com>

On Mon, May 05, 2025 at 10:33:49AM +0200, Janne Grunau wrote:
> Hej,
> 
> On Mon, May 5, 2025, at 09:53, gregkh@linuxfoundation.org wrote:
> > The patch below does not apply to the 6.6-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.6.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 32dce6b1949a696dc7abddc04de8cbe35c260217
> 
> This works for me without conflicts. Are there git configs which might
> influence this? The only noticeable thing is that the position of the
> DRM_DEBUG_DP_MST_TOPOLOGY_REFS entry shifted 82 lines down. I looked
> at the history of drivers/gpu/drm/Kconfig and the config
> DRM_DEBUG_DP_MST_TOPOLOGY_REFS block hasn't changed since v5.10. So I
> would expect the cherry-pick to work.

It applies cleanly, but breaks the build badly.  Try it and see :)

> Having said all that I don't know how important it is to have this in
> older stable releases when nobody noticed it before. The issue presents
> itself only with out-of-tree rust DRM drivers. I don't expect that
> anyone will try to backport those to old stable releases.
> 
> I'm fine with skipping this commit for stable releases for 6.6 and older
> and won't post backports.

Ok, thanks!

greg k-h

  reply	other threads:[~2025-05-05  8:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-05  7:53 FAILED: patch "[PATCH] drm: Select DRM_KMS_HELPER from" failed to apply to 6.6-stable tree gregkh
2025-05-05  8:33 ` Janne Grunau
2025-05-05  8:49   ` Greg Kroah-Hartman [this message]
2025-05-05 10:51     ` Janne Grunau
2025-05-06  6:19       ` Randy Dunlap

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=2025050530-monotype-eligibly-e5b1@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=alyssa@rosenzweig.io \
    --cc=j@jannau.net \
    --cc=stable@vger.kernel.org \
    --cc=tzimmermann@suse.de \
    /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