On 6/8/21 9:04 AM, Lukas Wunner wrote:
On Mon, Jun 07, 2021 at 07:02:52PM -0500, praneeth via lists.yoctoproject.org
wrote:
diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 4654d92d..834df5ff 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.10:"
BRANCH = "ti-rt-linux-5.10.y"
-SRCREV = "afe9ba17bb94cd226f9e5dc3685e4fe32be28c5c"
+SRCREV = "433ef931c699f08bef8c67de8458302c5f971c8b"
PV = "5.10.35+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb
b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 72a6c49c..47f1669e 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
BRANCH = "ti-linux-5.10.y"
-SRCREV = "72d727fe733f2610e937a063bcebedce329948ec"
+SRCREV = "ae876c7c91df646ab198331e676f250f06cfdeb5"
PV = "5.10.35+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
This doesn't apply cleanly to any of the dunfell, dunfell-next nor master
branches. SRCREV is currently 8fbd16658d11 and d85aee3e19aa, respectively
on those branches.
Which branch did you base this patch on?
The patch was made based on dunfell-next.
The conflict is seen because dunfell-next is not in sync with dunfell yet.
Once the following patches are pulled to dunfell branch, the patch can
be applied cleanly. I am sending a v2 shortly.
Ref:
2de2c5ec linux-ti-staging: Update 5.10 kernel to the latest commit SHA
6983b50e linux-ti-staging: Update 5.10 kernel to 5.10.35
Thanks,
Lukas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13815):
https://lists.yoctoproject.org/g/meta-ti/message/13815
Mute This Topic: https://lists.yoctoproject.org/mt/83384915/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
