From 7c33bfc37b154efce28c359f527ad32063479122 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 24 Mar 2019 23:11:56 -0400 Subject: linux-yocto/5.0: x86/resctrl: Rename INTEL_RDT to RESCTRL The following upstream commits have renamed INTEL_RDT to RESCTRL. 6fe07ce35e8a ("x86/resctrl: Rename the config option INTEL_RDT to RESCTRL") e6d429313ea5 ("x86/resctrl: Avoid confusion over the new X86_RESCTRL config") Signed-off-by: He Zhe Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel/linux') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb index 204f70030a..65c3698495 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "06e1ff79ea9efef052404ee1989cae038b28e954" -SRCREV_meta ?= "806a4922a78c0f447e3d0f61fe6b3cce1e2c0acb" +SRCREV_meta ?= "705457837e7ddd27e4e2ecf6d3dbd255b1aaf848" 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.0;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb index 105273ff7c..dc60548c6f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "b0477279877bb2b5cca6ec49c64e931901ff2022" SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" -SRCREV_meta ?= "806a4922a78c0f447e3d0f61fe6b3cce1e2c0acb" +SRCREV_meta ?= "705457837e7ddd27e4e2ecf6d3dbd255b1aaf848" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb index c7e288c4f8..be5dbaedc1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine_qemux86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine_qemumips64 ?= "2468c20c15477ebe5ecd73c0e0162d7432149318" SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" -SRCREV_meta ?= "806a4922a78c0f447e3d0f61fe6b3cce1e2c0acb" +SRCREV_meta ?= "705457837e7ddd27e4e2ecf6d3dbd255b1aaf848" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg