diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-28 09:47:55 -0400 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2022-05-09 04:01:07 -1000 |
commit | abf7178c03248f58caf403b6f80039ae23ed9bdf (patch) | |
tree | b6e9ebad3bc7d90970dae71e2ff562f94ffdfd12 | |
parent | 99d112f2d8f0c8b99ac8057bac93629284e0c5e2 (diff) | |
download | openembedded-core-abf7178c03248f58caf403b6f80039ae23ed9bdf.tar.gz |
linux-yocto/5.15: netfilter: conntrack: avoid useless indirection during conntrack destruction
Integrating the following commit(s) to linux-yocto/5.15:
07a63f760793 netfilter: conntrack: avoid useless indirection during conntrack destruction
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2aaf2429474da762d305d6fb70996b5502c879c7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 | ||||
-rw-r--r-- | 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 d7250ca4d5..9910ea023c 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 ?= "ec729d37e4036fe80d0294684aa779c091466307" -SRCREV_meta ?= "71a82e181708bc619684cc9f1eea01ec2595c2ff" +SRCREV_machine ?= "a5e556295fd7c0ec6095e12c0960d4313587e2e0" +SRCREV_meta ?= "cb8938bc9d6b4575a1cd0072106b9720648ed0ab" 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 2de1be9e46..96f09f3839 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 ?= "9f43f6966b7ef3cc76c465e1f53fe353740155df" -SRCREV_meta ?= "71a82e181708bc619684cc9f1eea01ec2595c2ff" +SRCREV_machine ?= "57d9f612e60a3b73774df1046dc3e3f7c17fbf49" +SRCREV_meta ?= "cb8938bc9d6b4575a1cd0072106b9720648ed0ab" 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 83e484693b..22b4a790fd 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 ?= "5c287562703770d5e466893c53bb9fca16b16fe8" -SRCREV_machine:qemuarm64 ?= "158f38930aa53b07009980cf417fbcddea58807d" -SRCREV_machine:qemumips ?= "2ebd4e128f3f0ad1bff5677f593a545053f9ff91" -SRCREV_machine:qemuppc ?= "566f4e67a086fbdeb17ebe3b7537f9f345001cd0" -SRCREV_machine:qemuriscv64 ?= "4e7122625996261d870160dfd2096108742f1009" -SRCREV_machine:qemuriscv32 ?= "4e7122625996261d870160dfd2096108742f1009" -SRCREV_machine:qemux86 ?= "4e7122625996261d870160dfd2096108742f1009" -SRCREV_machine:qemux86-64 ?= "4e7122625996261d870160dfd2096108742f1009" -SRCREV_machine:qemumips64 ?= "2aafd732abb0b9011e2041c7c5c9ab3f475dedd1" -SRCREV_machine ?= "4e7122625996261d870160dfd2096108742f1009" -SRCREV_meta ?= "71a82e181708bc619684cc9f1eea01ec2595c2ff" +SRCREV_machine:qemuarm ?= "2c5f632df378c23226fdb89fe36ad83c05d8da01" +SRCREV_machine:qemuarm64 ?= "4a6d3cff7783b6d6f0c8c09de3158cffe8fa97af" +SRCREV_machine:qemumips ?= "b8cca873d9d28cb48884ce4aa69983fe36867309" +SRCREV_machine:qemuppc ?= "b0a8af64b0b46184583f8eb05a3c7b038d5484bf" +SRCREV_machine:qemuriscv64 ?= "07a63f760793c64abe99674f067ae0643fdd2314" +SRCREV_machine:qemuriscv32 ?= "07a63f760793c64abe99674f067ae0643fdd2314" +SRCREV_machine:qemux86 ?= "07a63f760793c64abe99674f067ae0643fdd2314" +SRCREV_machine:qemux86-64 ?= "07a63f760793c64abe99674f067ae0643fdd2314" +SRCREV_machine:qemumips64 ?= "6456900204c039e30e383eebb27b97cffacf420a" +SRCREV_machine ?= "07a63f760793c64abe99674f067ae0643fdd2314" +SRCREV_meta ?= "cb8938bc9d6b4575a1cd0072106b9720648ed0ab" # 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 |