public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: sh8267.baek@samsung.com, ritesh.list@gmail.com,
	ulf.hansson@linaro.org, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree
Date: Tue, 10 Sep 2024 09:33:30 +0200	[thread overview]
Message-ID: <2024091016-diner-collide-5edc@gregkh> (raw)
In-Reply-To: <d1d85600-1d80-438d-be24-14c51ec3e576@intel.com>

On Mon, Sep 09, 2024 at 08:15:41AM +0300, Adrian Hunter wrote:
> On 8/09/24 14:28, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.10-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-5.10.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
> 
> The file name changed from cqhci.c to cqhci-core.c but git 2.43.0
> seems to handle it:
> 
> $ git version
> git version 2.43.0
> $ git log --oneline | head -1
> b57d01c66f40 Linux 5.10.225
> $ git cherry-pick -x aea62c744a9ae2a8247c54ec42138405216414da
> Auto-merging drivers/mmc/host/cqhci.c
> [detached HEAD dd4085252f0d] mmc: cqhci: Fix checking of CQHCI_HALT state
>  Author: Seunghwan Baek <sh8267.baek@samsung.com>
>  Date: Thu Aug 29 15:18:22 2024 +0900
>  1 file changed, 1 insertion(+), 1 deletion(-)

Note, we don't use git to apply backports like this, but I used it to
create the "raw" diff now, thanks!

greg k-h

      reply	other threads:[~2024-09-10  7:33 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-08 11:28 FAILED: patch "[PATCH] mmc: cqhci: Fix checking of CQHCI_HALT state" failed to apply to 5.10-stable tree gregkh
2024-09-09  5:15 ` Adrian Hunter
2024-09-10  7:33   ` 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=2024091016-diner-collide-5edc@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=adrian.hunter@intel.com \
    --cc=ritesh.list@gmail.com \
    --cc=sh8267.baek@samsung.com \
    --cc=stable@vger.kernel.org \
    --cc=ulf.hansson@linaro.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