summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-04-28 09:48:00 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-01 21:55:58 +0100
commit6da0cde02dd6a315a7eb34cb0bc691cf622eba05 (patch)
treef75a59f908b505ca07653cc29193cb9d658f4d41 /meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
parent992d9d41642981152a387fe59733cc6a77ea3528 (diff)
downloadopenembedded-core-6da0cde02dd6a315a7eb34cb0bc691cf622eba05.tar.gz
linux-yocto/5.15: fix -standard kernel build issue
Integrating the following commit(s) to linux-yocto/5.15: 4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices on forced removal"" The revert of commit [fbdev: Hot-unplug firmware fb devices on forced removal] was done to fix powerpc fbdev issues. Upstream went in a different direction, which means that our fbdev routines have conflicts with -stable updates. The fix for the fbdev is in -stable, so we drob our reverted commit, such that 5.15 builds again, and fbdev is functional. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index d3d277b172..fe1c7fb533 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "21f94b6c9601dbb03036d539482471ddbe753626"
-SRCREV_meta ?= "7e73214eee6728b7984d12bead8ad3af2ce06db9"
+SRCREV_machine ?= "4648820c6ca4146a3dbb4eb6a5b4ac93401f9596"
+SRCREV_meta ?= "a43150cc38bed6bf82d9217335348855c1d7eab8"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"