From 74d5d343672cdd83495f4e485f27fd553c702677 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 8 Jan 2023 19:38:58 -0500 Subject: linux-yocto/5.15: powerpc: Fix reschedule bug in KUAP-unlocked user copy Integrating the following commit(s) to linux-yocto/5.15: f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy (From OE-Core rev: 9308cfbb6cff9fd38fcea8495803d71da821aec2) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b457e6976e9e64a737517f9d9142ab290cdce214) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 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 dd9f940c7c..122fc0feac 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 ?= "6a972b54f014ca67588d73f32058c42af0bd856e" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine ?= "e53e73b907707b92b3433de7c9c776aa504b2d0b" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" 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}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 8aa2ee14f2..f060e22e84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6e85c80a960287ec238f53c91eeade3456044fa3" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine ?= "ae2415ee19511e205a983bc8024700c1f794076a" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index f28dae716b..bb48e158ab 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 ?= "24c30a8e9f8385f6d74785aa345f5731321b6c41" -SRCREV_machine:qemuarm64 ?= "c3caed57192735dc74adff939ea35af248a11177" -SRCREV_machine:qemumips ?= "3bed92886dc9177ce0076dada5056cbe83ec11f0" -SRCREV_machine:qemuppc ?= "45cbeb05d362ee51b7836a7faa07958670110c38" -SRCREV_machine:qemuriscv64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemuriscv32 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemux86 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemux86-64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemumips64 ?= "2642cdd862a63f5a8c2774f372f3d3424991b1b9" -SRCREV_machine ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine:qemuarm ?= "8c0f02ba7db6a463ca3aef969441906706edb350" +SRCREV_machine:qemuarm64 ?= "42a14881ba8145b2d1bdfc019c603abe79aeafd4" +SRCREV_machine:qemumips ?= "1ea321a5c9c66edba818ddffcef2aa9910de552e" +SRCREV_machine:qemuppc ?= "14da484e7f2fc95e10abb4db96bc5fd6b444cb60" +SRCREV_machine:qemuriscv64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemuriscv32 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemux86 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemux86-64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemumips64 ?= "8db5fd5c032f44486ef52f34724d0452aa3a6fea" +SRCREV_machine ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf