The patch below does not apply to the 4.19-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-4.19.y git checkout FETCH_HEAD git cherry-pick -x 7a0a6d0a7c805f9380381f4deedffdf87b93f408 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024071511-unwritten-backache-b96e@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 7a0a6d0a7c80 ("nvmem: meson-efuse: Fix return value of nvmem callbacks") 8cde3c2153e8 ("firmware: meson_sm: Rework driver as a proper platform driver") 611fbca1c861 ("nvmem: meson-efuse: add peripheral clock") 8649dbe58d35 ("nvmem: meson-efuse: add error message on user_max failure.") 0789724f86a5 ("firmware: meson_sm: Add serial number sysfs entry") thanks, greg k-h ------------------ original commit in Linus's tree ------------------