From 72ce03c8ee39b6169f4adfa168a0442d4c94be35 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 26 Apr 2019 10:52:17 -0400 Subject: linux-yocto/5.0: integrate TCP timeout / hang fix Integrating the following fix: [ tcp: fix issues relaed to implement coalescing on backlog queue As was discussed on -netdev, there's an issue with TCP timeouts and hangs due to new features introduced in the 5.0 kernel: https://www.spinics.net/lists/netdev/msg562928.html This is a temporary commit to widely test the proposed solution. It will be dropped when an official patch makes mainline. ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 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 07fa910ee8..ef3f0a0e1b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a" -SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" +SRCREV_machine ?= "a3309af7ab77156bd8d731df3a97126d3d897916" +SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" 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 c1084f2bb9..206e6c348d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9" -SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" +SRCREV_machine_qemuarm ?= "d905ae925fc4a60d63f45e1922163da683d8a3bc" +SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" 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 01269dda27..f34cc7b9db 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb @@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base" KBRANCH_qemux86-64 ?= "v5.0/standard/base" KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed9d11e2c8ebbfe056420cb89c2e5d02836496ce" -SRCREV_machine_qemuarm64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemumips ?= "40a729c3b0683d0875f8d6ad7353e6e429c7afc2" -SRCREV_machine_qemuppc ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87" -SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" +SRCREV_machine_qemuarm ?= "17c4b7e9db4d17aa713c85d0c3d2d84af962864a" +SRCREV_machine_qemuarm64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemumips ?= "e5c23fb31438dab373a50afc40f6e4ab0c568485" +SRCREV_machine_qemuppc ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemux86 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemux86-64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemumips64 ?= "743d799797ad6828472087e1da8c67fdab87bf75" +SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg