All of lore.kernel.org
 help / color / mirror / Atom feed
From: bruce.ashfield@gmail.com
To: richard.purdie@linuxfoundation.org
Cc: openembedded-core@lists.openembedded.org, raj.khem@gmail.com,
	jdmason@kudzu.us
Subject: [PATCH 14/15] linux-yocto/5.15: fix -standard kernel build issue
Date: Thu, 28 Apr 2022 09:48:00 -0400	[thread overview]
Message-ID: <6f449782a60991ef7fce66f2e1cf4743e4e4ec2f.1651153370.git.bruce.ashfield@gmail.com> (raw)
In-Reply-To: <cover.1651153370.git.bruce.ashfield@gmail.com>

From: Bruce Ashfield <bruce.ashfield@gmail.com>

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>
---
 .../linux/linux-yocto-rt_5.15.bb              |  4 ++--
 .../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 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}"
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 afb330e922..3f4509c921 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 ?= "2521f8951adffad70d844209b73cd8d8878710f1"
-SRCREV_meta ?= "7e73214eee6728b7984d12bead8ad3af2ce06db9"
+SRCREV_machine ?= "7505af5d55038e463bf45794603b6efabb655817"
+SRCREV_meta ?= "a43150cc38bed6bf82d9217335348855c1d7eab8"
 
 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 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
-- 
2.19.1



  parent reply	other threads:[~2022-04-28 13:48 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-28 13:47 [PATCH 00/15] kernel-yocto: consolidated pull request bruce.ashfield
2022-04-28 13:47 ` [PATCH 01/15] linux-yocto/5.15: arm: poky-tiny cleanup and fixes bruce.ashfield
2022-04-28 13:47 ` [PATCH 02/15] linux-yocto/5.15: update to v5.15.33 bruce.ashfield
2022-04-28 13:47 ` [PATCH 03/15] linux-yocto/5.10: update to v5.10.110 bruce.ashfield
2022-04-28 13:47 ` [PATCH 04/15] linux-yocto/5.10: base: enable kernel crypto userspace API bruce.ashfield
2022-04-28 13:47 ` [PATCH 05/15] linux-yocto/5.15: " bruce.ashfield
2022-04-28 13:47 ` [PATCH 06/15] linux-yocto/5.15: kasan: fix BUG: sleeping function called from invalid context bruce.ashfield
2022-04-28 13:47 ` [PATCH 07/15] kernel-yocto: allow patch author date to be commit date bruce.ashfield
2022-04-28 13:47 ` [PATCH 08/15] linux-yocto/5.15: fix ppc boot bruce.ashfield
2022-04-28 13:47 ` [PATCH 09/15] linux-yocto/5.15: netfilter: conntrack: avoid useless indirection during conntrack destruction bruce.ashfield
2022-04-28 13:47 ` [PATCH 10/15] linux-yocto/5.10: update to v5.10.112 bruce.ashfield
2022-04-28 13:47 ` [PATCH 11/15] linux-yocto/5.15: update to v5.15.35 bruce.ashfield
2022-04-28 13:47 ` [PATCH 12/15] linux-yocto/5.15: Fix CVE-2022-28796 bruce.ashfield
2022-04-28 13:47 ` [PATCH 13/15] linux-yocto: enable powerpc debug fragment bruce.ashfield
2022-04-28 13:48 ` bruce.ashfield [this message]
2022-04-28 13:48 ` [PATCH 15/15] linux-yocto/5.15: update to v5.15.36 bruce.ashfield
2022-04-29 11:51 ` [PATCH 00/15] kernel-yocto: consolidated pull request Richard Purdie
2022-04-29 12:40   ` Bruce Ashfield
     [not found]   ` <16EA5E7263695663.11702@lists.openembedded.org>
2022-04-29 20:01     ` [OE-core] " Bruce Ashfield
     [not found]     ` <16EA76835C38B7CA.4798@lists.openembedded.org>
2022-04-30  4:26       ` Bruce Ashfield
     [not found]       ` <16EA920E59E6B6F1.28542@lists.openembedded.org>
2022-04-30 21:35         ` Bruce Ashfield
2022-05-01  4:59           ` Richard Purdie
2022-05-04  7:18             ` Nicolas Dechesne
2022-05-04 12:45               ` Bruce Ashfield
2022-05-04 14:07                 ` Jon Mason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6f449782a60991ef7fce66f2e1cf4743e4e4ec2f.1651153370.git.bruce.ashfield@gmail.com \
    --to=bruce.ashfield@gmail.com \
    --cc=jdmason@kudzu.us \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=raj.khem@gmail.com \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.