diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-28 09:48:00 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-01 21:55:58 +0100 |
| commit | 6da0cde02dd6a315a7eb34cb0bc691cf622eba05 (patch) | |
| tree | f75a59f908b505ca07653cc29193cb9d658f4d41 /meta/recipes-kernel/linux/linux-yocto_5.15.bb | |
| parent | 992d9d41642981152a387fe59733cc6a77ea3528 (diff) | |
| download | openembedded-core-contrib-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_5.15.bb')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index bf4ea952cf..02b16b5f25 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "5dab48a9c4bb681646b06004bc081cc5b4e65285" -SRCREV_machine:qemuarm64 ?= "fc0cae7371697d26cda76f46d352648a0d8a8fd8" -SRCREV_machine:qemumips ?= "58617a04ab52b58a5393b5088a3199c3d28b7a15" -SRCREV_machine:qemuppc ?= "fdf86234f2a35c3fe2457ee02847b4351fdeb08b" -SRCREV_machine:qemuriscv64 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" -SRCREV_machine:qemuriscv32 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" -SRCREV_machine:qemux86 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" -SRCREV_machine:qemux86-64 ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" -SRCREV_machine:qemumips64 ?= "0294ba0989f839fb11c41fb887707cb49d20143e" -SRCREV_machine ?= "5df6d1b00f95b5bce43bb208b87b182b0656dfed" -SRCREV_meta ?= "7e73214eee6728b7984d12bead8ad3af2ce06db9" +SRCREV_machine:qemuarm ?= "2d10943aa7855dc5bbe2c74c6f05ef2e4eb39e3a" +SRCREV_machine:qemuarm64 ?= "b623e8d1eaacbeee250ea37328a9b566ca52f890" +SRCREV_machine:qemumips ?= "7e897b81f922149be5edaab68eb8034a75899ce7" +SRCREV_machine:qemuppc ?= "c3db8eb7b0a5b171ac4c0c6def487b5572a7b3f9" +SRCREV_machine:qemuriscv64 ?= "4eba9348d3e2eeb1070f07bf360a9e404aceb25b" +SRCREV_machine:qemuriscv32 ?= "4eba9348d3e2eeb1070f07bf360a9e404aceb25b" +SRCREV_machine:qemux86 ?= "4eba9348d3e2eeb1070f07bf360a9e404aceb25b" +SRCREV_machine:qemux86-64 ?= "4eba9348d3e2eeb1070f07bf360a9e404aceb25b" +SRCREV_machine:qemumips64 ?= "9868746e0736d8659374e93129cca9d3413a7918" +SRCREV_machine ?= "4eba9348d3e2eeb1070f07bf360a9e404aceb25b" +SRCREV_meta ?= "a43150cc38bed6bf82d9217335348855c1d7eab8" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same |