From d88ce948ff2c910e796b78be388bec9578f6eb9c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 16 Dec 2018 22:38:18 -0500 Subject: linux-yocto/4.18: bug fixes and configuration tweaks Integrating the following commits: 2ba9a28434f8 netfilter: use kvmalloc_array to allocate memory for hashtable 6e1fae5d233a ipv4: net namespace does not inherit network configurations As well as the following configuration changes: ed1978c99214 features/module-signing: add new feature a28fd4843381 edac: Drop CONFIG_EDAC_MM_EDAC and add dependency 8ae63963256e xfs: add xfs support Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_4.18.bb | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb index 2a92a69b5f..cd685bd5b6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "cab37ca8426b490e995a9614f15448e135399993" -SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639" +SRCREV_machine ?= "8334c6cfdac2036631caa877ffad8d3ec424a265" +SRCREV_meta ?= "ed1978c99214b03740a8989d46f175252435ddc2" 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-4.18;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb index 968b94c207..145992e5d7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639" +SRCREV_machine_qemuarm ?= "fad657599d15977f1ecb5cdf1719526dacf5f529" +SRCREV_machine ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99" +SRCREV_meta ?= "ed1978c99214b03740a8989d46f175252435ddc2" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb index da0f076c92..70fadcc104 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb @@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.18/standard/base" KBRANCH_qemux86-64 ?= "v4.18/standard/base" KBRANCH_qemumips64 ?= "v4.18/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "0573ed3c737c82b24fd661cc5ea961cac07ea2fe" -SRCREV_machine_qemuarm64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemumips ?= "465252ba0ec00ae10397cb4623c3d77c89e542a5" -SRCREV_machine_qemuppc ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemux86 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemux86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_machine_qemumips64 ?= "6d91dc62811f4688efc67845185858645b4ccfb8" -SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" -SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639" +SRCREV_machine_qemuarm ?= "285677060e108d00ed786b5347d447807d94a963" +SRCREV_machine_qemuarm64 ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99" +SRCREV_machine_qemumips ?= "cbfe1fd6157ff4a1497dad50164bd493cb680f17" +SRCREV_machine_qemuppc ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99" +SRCREV_machine_qemux86 ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99" +SRCREV_machine_qemux86-64 ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99" +SRCREV_machine_qemumips64 ?= "090c1efbf5d1e9267f73eec102a53ea7b155d7c1" +SRCREV_machine ?= "2ba9a28434f83c917ad3cfb8b4f7db6066c26a99" +SRCREV_meta ?= "ed1978c99214b03740a8989d46f175252435ddc2" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" -- cgit 1.2.3-korg