From: Yongqin Liu <yongqin.liu@linaro.org>
To: stable@vger.kernel.org
Cc: "Naresh Kamboju" <naresh.kamboju@linaro.org>,
"Benjamin Copeland" <benjamin.copeland@linaro.org>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Daniel Díaz" <daniel.diaz@linaro.org>,
"Alistair Delva" <adelva@google.com>,
"Steve Muckle" <smuckle@google.com>,
"Todd Kjos" <tkjos@google.com>,
"Bajjuri, Praneeth" <praneeth@ti.com>,
"Vincent Guittot" <vincent.guittot@linaro.org>,
"Anders Roxell" <anders.roxell@linaro.org>,
linux-mmc@vger.kernel.org, linux-block@vger.kernel.org,
"Ulf Hansson" <ulf.hansson@linaro.org>
Subject: Please help cherry pick four mmc related changes into the 4.14 stable kernel
Date: Wed, 8 Jun 2022 01:09:54 +0800 [thread overview]
Message-ID: <CAMSo37WW9veYH6=tHqUR2pa_7YX1UuzHqLBHit60P2QyzQmCEw@mail.gmail.com> (raw)
Hi, All
With the 4.14.281 version[1], there were three mmc related changes merged,
but that causes one boot failure with the X15 Android builds, a problem
similar to one reported before here[2].
After being confirmed with Ulf Hansson, and verified with the X15 Android build,
it needs to have the following four commits cherry-picked to the 4.14
branch as well.
4f32b45c9a2c mmc: core: Allow host controllers to require R1B for CMD6
5fc615c1e3eb mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard
d091259b8d7a mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command
23161bed631a mmc: sdhci-omap: Fix busy detection by enabling
MMC_CAP_NEED_RSP_BUSY
The above four commits are from the 4.19 branch, as they are a little
easier to be cherry-picked
into the 4.14 branch, compared to the commits from the mainline branch.
(I have confirmed that the four commits are all in 4.19, 5.4, 5.10 and
mainline branches already).
Saying that, there will be still one merge conflict reported when
cherry picking the commit of
4f32b45c9a2c, it's easy to resolve though.
To avoid the merge conflict, it could be done like this as well:
1. revert the 327b6689898b commit from 4.14 first, so that the commits in step#2
could be cherry-picked without any problem
327b6689898b mmc: core: Default to generic_cmd6_time as
timeout in __mmc_switch()
2. git cherry-pick the following commits from 4.19 into the 4.14 branch
4f32b45c9a2c mmc: core: Allow host controllers to require R1B for CMD6
5fc615c1e3eb mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for
erase/trim/discard
d091259b8d7a mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC
sleep command
23161bed631a mmc: sdhci-omap: Fix busy detection by enabling
MMC_CAP_NEED_RSP_BUSY
26c6f614cf02 mmc: mmc: core: Default to generic_cmd6_time as
timeout in __mmc_switch()
The last commit of 26c6f614cf02 is for the revert in step#1.
I am not sure which way is more convenient for the maintenance work
here, so just list both of them here
for your information.
And please let me know if there is anything else I could help on this
cherry pick work here.
[1]: https://lore.kernel.org/lkml/16534624745741@kroah.com/T/
[2]: https://lore.kernel.org/lkml/CA+G9fYuqAQfhzF2BzHr7vMHx68bo8-jT+ob_F3eHQ3=oFjgYdg@mail.gmail.com/
--
Best Regards,
Yongqin Liu
---------------------------------------------------------------
#mailing list
linaro-android@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-android
next reply other threads:[~2022-06-07 17:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 17:09 Yongqin Liu [this message]
2022-06-13 18:11 ` Please help cherry pick four mmc related changes into the 4.14 stable kernel Greg KH
2022-06-16 8:49 ` Yongqin Liu
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='CAMSo37WW9veYH6=tHqUR2pa_7YX1UuzHqLBHit60P2QyzQmCEw@mail.gmail.com' \
--to=yongqin.liu@linaro.org \
--cc=adelva@google.com \
--cc=anders.roxell@linaro.org \
--cc=benjamin.copeland@linaro.org \
--cc=daniel.diaz@linaro.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=naresh.kamboju@linaro.org \
--cc=praneeth@ti.com \
--cc=smuckle@google.com \
--cc=stable@vger.kernel.org \
--cc=sumit.semwal@linaro.org \
--cc=tkjos@google.com \
--cc=ulf.hansson@linaro.org \
--cc=vincent.guittot@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;
as well as URLs for NNTP newsgroup(s).