Re: FAILED: patch "[PATCH] mmc: core: Allow host controllers to require R1B for CMD6" failed to apply to 5.5-stable tree

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Fri, Mar 20, 2020 at 10:12:15AM +0100, Ulf Hansson wrote:
> + Naresh
> 
> On Wed, 18 Mar 2020 at 20:25, Sasha Levin <sashal@kernel.org> wrote:
> >
> > On Mon, Mar 16, 2020 at 12:31:18PM +0100, gregkh@linuxfoundation.org wrote:
> > >
> > >The patch below does not apply to the 5.5-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>.
> > >
> > >thanks,
> > >
> > >greg k-h
> > >
> > >------------------ original commit in Linus's tree ------------------
> > >
> > >From 1292e3efb149ee21d8d33d725eeed4e6b1ade963 Mon Sep 17 00:00:00 2001
> > >From: Ulf Hansson <ulf.hansson@linaro.org>
> > >Date: Tue, 10 Mar 2020 12:49:43 +0100
> > >Subject: [PATCH] mmc: core: Allow host controllers to require R1B for CMD6
> > >
> > >It has turned out that some host controllers can't use R1B for CMD6 and
> > >other commands that have R1B associated with them. Therefore invent a new
> > >host cap, MMC_CAP_NEED_RSP_BUSY to let them specify this.
> > >
> > >In __mmc_switch(), let's check the flag and use it to prevent R1B responses
> > >from being converted into R1. Note that, this also means that the host are
> > >on its own, when it comes to manage the busy timeout.
> > >
> > >Suggested-by: Sowjanya Komatineni <skomatineni@nvidia.com>
> > >Cc: <stable@vger.kernel.org>
> > >Tested-by: Anders Roxell <anders.roxell@linaro.org>
> > >Tested-by: Sowjanya Komatineni <skomatineni@nvidia.com>
> > >Tested-by: Faiz Abbas <faiz_abbas@ti.com>
> > >Tested-By: Peter Geis <pgwipeout@gmail.com>
> > >Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> >
> > I've fixed up and queued this whole mmc series of stable tagged patches
> > for 4.19-5.5.
> 
> I looked at stable-rc tree and realized that you have also picked the
> following patch:
> 
> commit 533a6cfe08f96a7b5c65e06d20916d552c11b256
> Author: Ulf Hansson <ulf.hansson@linaro.org>
> Date:   Wed Jan 22 15:27:47 2020 +0100
> mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()
> 
> I assume this one was needed to apply the others mmc patches on top.
> This is a problem, because the above patch should not go for stable as
> it causes problems (unless additional patches are backported as well).
> 
> I suggest to drop the whole slew of mmc patches for the current stable
> rcs. Then I can send manual backports instead, is that okay?

Yes, I have now done that, having a properly backported set of patches
would be great, thanks!

greg k-h