From 119d7d0caad028fe8f98b720624a1dd2cac06a14 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 6 Oct 2023 13:29:24 +0000
Subject: [PATCH] main/linux-lts: enable qdisc fq_pie
fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/15332
---
main/linux-lts/APKBUILD | 22 +++++++++++-----------
main/linux-lts/lts.aarch64.config | 1 +
main/linux-lts/lts.armv7.config | 1 +
main/linux-lts/lts.s390x.config | 1 +
main/linux-lts/lts.x86.config | 1 +
main/linux-lts/lts.x86_64.config | 1 +
main/linux-lts/virt.aarch64.config | 1 +
main/linux-lts/virt.armv7.config | 1 +
main/linux-lts/virt.ppc64le.config | 1 +
main/linux-lts/virt.x86.config | 1 +
main/linux-lts/virt.x86_64.config | 1 +
11 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index b3fd264a9bb0..a256719ecef4 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=2
+pkgrel=3
pkgdesc="Linux lts kernel"
url="https://www.kernel.org"
depends="initramfs-generator"
@@ -347,16 +347,16 @@ c74488940244ba032e741c370767467cfab93b89077b5dfccfed39b658f381e0995527e6c61de53b
f8582538a8482656138a0ae56b67a6d3cec09ff8d82a3f790ffa3fa7c37d0ae24a04f01f0ae1aec09838f86490907995c2568be7841a3821f0e64704f60153e5 0001-tty-Move-sysctl-setup-into-core-tty-logic.patch
0bfd2c138e997f25f821cd518263ad515fc303bbde37bcdb7dd651d30316c77652fec6fedb195102b8476b92b1e7269c143dad5df6431db49c4318375ad2e802 0002-tty-Allow-TIOCSTI-to-be-disabled.patch
8b245ec672a56dae7ce82f488880f6f3c0b65776177db663a29f26de752bf2cefe6b677e2cedbebd85e98d6f6e3d66b9f198a0d7a6042a20191b5ca8f4a749e7 0003-tty-Move-TIOCSTI-toggle-variable-before-kerndoc.patch
-a9a581540de0493bd8a3a5d85872ad8769996c0df5411036ff12913debdb1b92c1ce34a0fcbd5882cb503a54e150abcf5321b0a8a7680d22c647b5e0a9ae4703 lts.aarch64.config
-c91f17d58c4579ea0787d4d9f4c4dfb12eebac426d6ac945395b0c864117bb47e99ebf2304dcdbfed1dd7017b73bfb22155a07c6596836adc807e95c5e0e8604 lts.armv7.config
-db388c1d356db53ff48e196be02f982cf696fadbc26cc051c36ed6eb20f4e81f6bcce0a85ec8b6ffab6953331a615665853780c9a4cb43b98440178f00b30e53 lts.x86.config
-9bb206709c391ff0b74c6058189b43ef6d65fec655e12273485b811959119dbcb653b2201c92d234e6fc580fae78152ca7f5ff61c32628aee34918eba90ff365 lts.x86_64.config
+6a0bfe99de383ef4531f66888b1d3e0cf35854b869290757e8eba19b76594e3f9686af62976c0e8d37c9a890c31ee51683e55b137fe60d7ee01f582098930555 lts.aarch64.config
+e4ad1b97e4862442dc28c47115ab992ff4e8e66774d402b292800008993b8453d1e4c18fd1d1a78beecd1e9dba26a7d1c31735d23e0bc606e611a8a351024b1f lts.armv7.config
+98b5b8ab524bc6a36a41e2c07644b85b477ee1a2b68985276da261a12db49c8bae307a47cd7ebd80bed6fa853b0c5f604c542ee3591c6dbae002fd51b04322b8 lts.x86.config
+92f9a97194534feea0a59294ad18906d48ee67e55223b2da0d762f9c6a53df718994673179ec50b6c4e2b33cfdea93e164cbdf9740294b627f7f319fb2bcab80 lts.x86_64.config
3d5d1414c3af58b2f8b1601a0126de5dcbc24e1101f985509c6d444a73c1949a1796a33dd1c84493a26e38b6ee17685641cd2a219971b6a4b39f212bec560aa3 lts.ppc64le.config
-033a5d0d457a8751a379eb29c392964eadea0796990483b92d444f276975fb40994f735d74491002c7ebfad8dd65196c94546a4f0dbd0a08e198aad4f5597b47 lts.s390x.config
-5deac62ed5a6f06b324d58e47e19712e7576cbb2693dee276eaf29f61f4e029293b906f5fe6f576d1849ef13b40a9fe5ecbd22a1caed76198fc2c754be07d307 virt.aarch64.config
-625e74a95aa722e8f07263fbc88ab67b1d752a8c2233430a8ba32a5a50b49a63405707beebeed67130f2e1df56a846ac7915449d9c3040bf86b7dfc05bb383f1 virt.armv7.config
-a5b3ba956076e1dbad570e9a313117cd6d12b26f413b2e55eb647af0a13739fdacd442bdf6dc0aa8d93dd4535d49c059f5f4e258ef80cdc2a454e0e6756640db virt.ppc64le.config
-99d08847ce44d09db63f6c44c3f90e742d802c6d6b69ec54176b2110ec8bd28297ee85380cc0b04e4744b2723fe7cbfea047e2cdd7a3ab0733443c2599eaeb15 virt.x86.config
-46b43a2b60c3b276a51b0ab6c7086c6d1eb06407004d3be552241ca5073ceb7dcd9792ef750a44618fb17c0deabc2ea87bbc11b73353aaa612665acfd2869dbd virt.x86_64.config
+6780b83c513dbe30021ffb18c7ca6ed8162ad05883e93b2015b8d857da8919070ba7a74c999f56ca593f02f9923e819793979bce195469544f9de05a4b215d39 lts.s390x.config
+378fcf86d4a7bdc3f355e0b7200ac6b8bf137fb6abf664f4e9ebcb4fbc4ef9e8fad86c41d71b0a3a5f6647de7eb46d4ac57a557523b42ab005b971bb604101f1 virt.aarch64.config
+28df77d58da2bea89b17ecefebe90d6e34024a04f1c91308520b22f2e1d8858edf30b995d451a77a0b9a6276952257384ef1736f38161b1181a8cc4616fd5800 virt.armv7.config
+ed880584fb07b1ceb599ce528c48bc75ebeca2b1d8dae7efa713e7397a6ace98162e9d775d9c957ec2df733b1b13a444e9ae8b915d26b38bbb02c39f3c16fd49 virt.ppc64le.config
+1bde69c44b5f30679ee8925689a630887ff84822286c3876bd539ad66986fdbd71b57ca195cd02e8259b8f537403de4b21ca2d11d6a43f9e6928e9770c2aff23 virt.x86.config
+4aa7c84eee75820d4a7c166d69de0630c08107fe0e45d1d7b7a1f84acca12164516ea99dd1087335762f90014858513bd150823b73eb3f92f9eb934634544758 virt.x86_64.config
4d89f2e33b070f461ab76e8c0916e8e2bb3f8f6ed7f19a1cb9ef7f8afa653da151d3233632eb9286c808f6ff457c1d91278387275466dfe8170e5a111d48175f patch-6.1.55.xz
"
diff --git a/main/linux-lts/lts.aarch64.config b/main/linux-lts/lts.aarch64.config
index 4e949b152563..ea01cffa0e5b 100644
--- a/main/linux-lts/lts.aarch64.config
+++ b/main/linux-lts/lts.aarch64.config
@@ -493,6 +493,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/lts.armv7.config b/main/linux-lts/lts.armv7.config
index e8b92ae579e9..fee3c18296a0 100644
--- a/main/linux-lts/lts.armv7.config
+++ b/main/linux-lts/lts.armv7.config
@@ -480,6 +480,7 @@ CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/lts.s390x.config b/main/linux-lts/lts.s390x.config
index 5d03ec0f6a5c..1fb336a7cc06 100644
--- a/main/linux-lts/lts.s390x.config
+++ b/main/linux-lts/lts.s390x.config
@@ -406,6 +406,7 @@ CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/lts.x86.config b/main/linux-lts/lts.x86.config
index 5229194fdc46..320f404268b7 100644
--- a/main/linux-lts/lts.x86.config
+++ b/main/linux-lts/lts.x86.config
@@ -485,6 +485,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/lts.x86_64.config b/main/linux-lts/lts.x86_64.config
index ec172fa92f8b..b5c1269407a0 100644
--- a/main/linux-lts/lts.x86_64.config
+++ b/main/linux-lts/lts.x86_64.config
@@ -507,6 +507,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/virt.aarch64.config b/main/linux-lts/virt.aarch64.config
index e09478aeda27..8a40f1edff75 100644
--- a/main/linux-lts/virt.aarch64.config
+++ b/main/linux-lts/virt.aarch64.config
@@ -435,6 +435,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/virt.armv7.config b/main/linux-lts/virt.armv7.config
index 3a2c19abce2e..f11e74519837 100644
--- a/main/linux-lts/virt.armv7.config
+++ b/main/linux-lts/virt.armv7.config
@@ -418,6 +418,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/virt.ppc64le.config b/main/linux-lts/virt.ppc64le.config
index f30cc234c719..06c3ec0217e8 100644
--- a/main/linux-lts/virt.ppc64le.config
+++ b/main/linux-lts/virt.ppc64le.config
@@ -425,6 +425,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/virt.x86.config b/main/linux-lts/virt.x86.config
index 37e406384364..4f9dcef8fb6d 100644
--- a/main/linux-lts/virt.x86.config
+++ b/main/linux-lts/virt.x86.config
@@ -433,6 +433,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
diff --git a/main/linux-lts/virt.x86_64.config b/main/linux-lts/virt.x86_64.config
index 34189b4d1726..647df3ef96c0 100644
--- a/main/linux-lts/virt.x86_64.config
+++ b/main/linux-lts/virt.x86_64.config
@@ -449,6 +449,7 @@ CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_HHF=m
CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_CLS_BASIC=m
--
GitLab