On Mon, Sep 09, 2024 at 08:15:41AM +0300, Adrian Hunter wrote: > On 8/09/24 14:28, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>. > > > > 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@xxxxxxxxxxx> > 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
