From 6aef2d983bfc353adbf8d4e215c371140cdbe137 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 26 Aug 2019 07:39:44 +0000 Subject: main/linux-vanilla: enable CONFIG_BLK_DEV_THROTTLING This is needed for lxc-top to show I/O serviced reporting. fixes #10754 --- main/linux-vanilla/APKBUILD | 22 +++++++++++----------- main/linux-vanilla/config-vanilla.aarch64 | 5 +++-- main/linux-vanilla/config-vanilla.armhf | 5 +++-- main/linux-vanilla/config-vanilla.ppc64le | 2 +- main/linux-vanilla/config-vanilla.s390x | 5 +++-- main/linux-vanilla/config-vanilla.x86 | 5 +++-- main/linux-vanilla/config-vanilla.x86_64 | 5 +++-- main/linux-vanilla/config-virt.aarch64 | 2 +- main/linux-vanilla/config-virt.x86 | 5 +++-- main/linux-vanilla/config-virt.x86_64 | 2 +- 10 files changed, 32 insertions(+), 26 deletions(-) (limited to 'main') diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index e4911db822..3d027d245e 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux vanilla kernel" url="http://kernel.org" depends="mkinitfs" @@ -221,14 +221,14 @@ _dev() { } sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 linux-4.19.tar.xz -68e1b7548364becbae69418c55e265a05f78c5173e1c6d640e74c8af29a028a0d0f054483adba645d611ff97517ea14a6af840b7e69ec0719b00af1503a9646a config-vanilla.aarch64 -2396809cc53cabc5546ea4d3294347a43a9bdb5682f91a943d52bb268360a29394c56300182a361a8d35a48a86315be5f8d4518b85b6b842f3a130bf68b7bbb1 config-vanilla.armhf -2396809cc53cabc5546ea4d3294347a43a9bdb5682f91a943d52bb268360a29394c56300182a361a8d35a48a86315be5f8d4518b85b6b842f3a130bf68b7bbb1 config-vanilla.armv7 -525ad36c6f0db0660814ccdcb5ded28702e594dd38ed2ba176ac2288ef3d9076eca4ad2290560a0a6a317f1f886fd71096394c081358f533eb03dc79da58ae33 config-vanilla.x86 -e5a5f1db295867c8289b5cb958b801b4220288e130536efa5515dfa956225055cbb8028f8b3e56e590fb80d7295dbbf63243842ca172d0485d5c2fe449a92244 config-vanilla.x86_64 -37b7a375839693753f4d75c0d410f6314c646a1da2b168d9a3db8e3767e62b44676fd4ee2cd599b703bad9e73ced64591e8ac5edafc811b2585f3a49575d50f7 config-vanilla.ppc64le -4af65bf72b5eeff1dd00163eff286ace6af1c6aaf2760a8933669bde07411c7eae6d2988a4c4ad8f9bc97ed43fa4ca33a9bc3f9dd57e38c9f2bc070158b956af config-vanilla.s390x -6befbc3fc9d5302cf3dc63a584a4d2f49e7428ef967ffb550bd3138cb1a1e46a24c7ef917cd8b341b4fb6a930b2998b70bee424a9b370a227bcfae26796c32c7 config-virt.aarch64 -1eed7436148fc9d0afd4b4ccc15a6dca8288fe09f082758c0dde688d310c3c553fa7ea9f0c853e0a5815f103a4de2840bef81a32200b2d072df8cf1694ed9750 config-virt.x86 -c268a2365bc8b907b2f5c726ebb61c01ed0d8718be5c3fe97f39239143557698420b3eca682e39c3fe3e9431784dfde37d15482a5999b159c0915d4cc11cb8a9 config-virt.x86_64 +50ae7e70fc764f04c2b531518b4bec7b2145a6a08149816fa50dd40f398906009a2e1d82d0af34ed578dbbb96211bddaf9cb3bc77ed1058059cc0893e76ae7a9 config-vanilla.aarch64 +1bbbc09b17a2d98d296276c2da3163bc9eaf5c4a0307daacd28381735a0e261fb57192719472c6257e1b3b80ad85bd340e08b0bf148695042caf329f5bf669b0 config-vanilla.armhf +1bbbc09b17a2d98d296276c2da3163bc9eaf5c4a0307daacd28381735a0e261fb57192719472c6257e1b3b80ad85bd340e08b0bf148695042caf329f5bf669b0 config-vanilla.armv7 +6c92b315e87349a0e8cf9e05101ccca4113ef2b553ce91966b5efd5b02b5e2691f9d8f5b74104b2d1cbccc5543c064ee3cecc7a729bd646848b5730759f41086 config-vanilla.x86 +c64fb857642808a1a7b7107ecd16b50e6dbdea1287434780cd8974ec6a5518e2946f2985a38e938adf1b212daa1a9d6f7813a3afc9861b4104d6650bc88c5acb config-vanilla.x86_64 +a579b231245d082700f565fbadba2c6ea982c0074fe84e1ae3fdf922bafbd35565071a6e860338d95f001a3c3c583182c0f3632b33e78434463fb7b10364f9f8 config-vanilla.ppc64le +a13751b71fcf76adc421c247136de7495a4bc7944236e2a1c3fd93449f054f8ebca783e5cc63aebd6bd9a1dca77db6f7dbb08451826421cbca388f0ec823a2ce config-vanilla.s390x +9eab9df75a19a09e504bfff833135cfb6502578a85b66c6db5a7a00890ce5c72640d4d07a6a925e5d48b39645f1928d344e6e4f8456fc0d7127f11eae896aac4 config-virt.aarch64 +fbb89a74efec783adad0188b4b8fdc9f8d113aee601f3410061c7f50b706d4f49241f6ad974527d2f312c56dd270d9e1b0a7c3da7b32988c88aeedf000ce7c8f config-virt.x86 +6e6ff4fd7046bc65f71e55f77f2c347690eefe71da4d0f596fe70090f5e57f291ba885cec1678e9549c48113942c61857b3084959f6bdce83e1606b2e522a1a1 config-virt.x86_64 a73ea67811cdb6c7b86a249f21252e76af5926b50df7cd7a3b418b49a24afd5c66e69394cd0152dcbd8837c1271af485b794953d18595c936d4d62ac54442107 patch-4.19.67.xz" diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64 index ce65f2f5c8..8f70ca10aa 100644 --- a/main/linux-vanilla/config-vanilla.aarch64 +++ b/main/linux-vanilla/config-vanilla.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.67 Kernel Configuration +# Linux/arm64 4.19.68 Kernel Configuration # # @@ -757,7 +757,8 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y diff --git a/main/linux-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf index 19f37bd8cd..c624f21bb8 100644 --- a/main/linux-vanilla/config-vanilla.armhf +++ b/main/linux-vanilla/config-vanilla.armhf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.67 Kernel Configuration +# Linux/arm 4.19.68 Kernel Configuration # # @@ -730,7 +730,8 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y diff --git a/main/linux-vanilla/config-vanilla.ppc64le b/main/linux-vanilla/config-vanilla.ppc64le index c844f3eb2c..e61830814d 100644 --- a/main/linux-vanilla/config-vanilla.ppc64le +++ b/main/linux-vanilla/config-vanilla.ppc64le @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.19.67 Kernel Configuration +# Linux/powerpc 4.19.68 Kernel Configuration # # diff --git a/main/linux-vanilla/config-vanilla.s390x b/main/linux-vanilla/config-vanilla.s390x index 7542859e33..cc3eca2ae0 100644 --- a/main/linux-vanilla/config-vanilla.s390x +++ b/main/linux-vanilla/config-vanilla.s390x @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 4.19.67 Kernel Configuration +# Linux/s390 4.19.68 Kernel Configuration # # @@ -500,7 +500,8 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86 index d93b378d3b..ca97d8dfcd 100644 --- a/main/linux-vanilla/config-vanilla.x86 +++ b/main/linux-vanilla/config-vanilla.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.67 Kernel Configuration +# Linux/x86 4.19.68 Kernel Configuration # # @@ -799,7 +799,8 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64 index ecdd8998f2..66c6c7aade 100644 --- a/main/linux-vanilla/config-vanilla.x86_64 +++ b/main/linux-vanilla/config-vanilla.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.67 Kernel Configuration +# Linux/x86_64 4.19.68 Kernel Configuration # # @@ -837,7 +837,8 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y diff --git a/main/linux-vanilla/config-virt.aarch64 b/main/linux-vanilla/config-virt.aarch64 index 6d0eb33e5b..02e8526942 100644 --- a/main/linux-vanilla/config-virt.aarch64 +++ b/main/linux-vanilla/config-virt.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.67 Kernel Configuration +# Linux/arm64 4.19.68 Kernel Configuration # # diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86 index 5fd0d29731..62916be4cb 100644 --- a/main/linux-vanilla/config-virt.x86 +++ b/main/linux-vanilla/config-virt.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.67 Kernel Configuration +# Linux/x86 4.19.68 Kernel Configuration # # @@ -743,7 +743,8 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64 index 6bd7a500c5..491c042f25 100644 --- a/main/linux-vanilla/config-virt.x86_64 +++ b/main/linux-vanilla/config-virt.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.67 Kernel Configuration +# Linux/x86_64 4.19.68 Kernel Configuration # # -- cgit v1.2.3