diff options
author | graysky | 2020-04-01 10:31:19 -0400 |
---|---|---|
committer | graysky | 2020-04-01 10:31:19 -0400 |
commit | 3ef48f8c742b7f98dd4022936ffcf78ef692e27d (patch) | |
tree | ce7db9302d6b8984bd163bf53b6e1f2cdcda724b | |
parent | 0b38d37a27b0ae9f75cb867776f153de2ddc8869 (diff) | |
download | aur-3ef48f8c742b7f98dd4022936ffcf78ef692e27d.tar.gz |
Update to 5.5.14-1
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch | 58 | ||||
-rw-r--r-- | PKGBUILD | 10 |
3 files changed, 12 insertions, 74 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-ck - pkgver = 5.5.13 - pkgrel = 2 + pkgver = 5.5.14 + pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 license = GPL2 @@ -8,8 +8,8 @@ pkgbase = linux-ck makedepends = kmod makedepends = libelf options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.13.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.13.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.14.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.14.tar.sign source = config source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz source = http://ck.kolivas.org/patches/5.0/5.5/5.5-ck1/patch-5.5-ck1.xz @@ -24,10 +24,9 @@ pkgbase = linux-ck source = 0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch source = 0010-drm-i915-Introduce-a-vma.kref.patch source = 0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch - source = 0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 1f3b3614a06bffc9c621c82f98d8ca88c60538a8c6dd77f96f2e7fee310a4ee2 + sha256sums = 4c529e4e100df11887e0a789d0e46d7ffd053e68a0380b6173a3a2799192ef6a sha256sums = SKIP sha256sums = 0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06 sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5 @@ -43,7 +42,6 @@ pkgbase = linux-ck sha256sums = 6d305596dc9be86a65b9200bf69c001a8e4ddd41cad471289c3c769b5530c359 sha256sums = a4a10bcb55fc1991200c3835b359b81f5e3e858f5be77c6b9eaef033885c8bfc sha256sums = a578a12239e39728c63038db6539abcee422bed4d04ee5bf99f6ba5be8884a9a - sha256sums = 4e59212ab1951d1064132cf54c6531d9245a987648de2cad3ca448ae183a53c7 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler @@ -52,11 +50,11 @@ pkgname = linux-ck depends = initramfs optdepends = crda: to set the correct wireless channels of your country optdepends = linux-firmware: firmware images needed for some devices - provides = linux-ck=5.5.13 + provides = linux-ck=5.5.14 pkgname = linux-ck-headers pkgdesc = Headers and scripts for building modules for Linux-ck kernel depends = linux-ck - provides = linux-ck-headers=5.5.13 - provides = linux-headers=5.5.13 + provides = linux-ck-headers=5.5.14 + provides = linux-headers=5.5.14 diff --git a/0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch b/0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch deleted file mode 100644 index dddd63697f8f..000000000000 --- a/0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9ff88052dbb54cdb7b05d91561b3540056c96e83 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Mon, 30 Mar 2020 22:37:11 +0200 -Subject: [PATCH 12/13] Revert "bpf: Provide better register bounds after jmp32 - instructions" - -This reverts commit 581738a681b6faae5725c2555439189ca81c0f1f. ---- - kernel/bpf/verifier.c | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index 7d530ce8719d..79f38a281390 100644 ---- a/kernel/bpf/verifier.c -+++ b/kernel/bpf/verifier.c -@@ -1034,17 +1034,6 @@ static void __reg_bound_offset(struct bpf_reg_state *reg) - reg->umax_value)); - } - --static void __reg_bound_offset32(struct bpf_reg_state *reg) --{ -- u64 mask = 0xffffFFFF; -- struct tnum range = tnum_range(reg->umin_value & mask, -- reg->umax_value & mask); -- struct tnum lo32 = tnum_cast(reg->var_off, 4); -- struct tnum hi32 = tnum_lshift(tnum_rshift(reg->var_off, 32), 32); -- -- reg->var_off = tnum_or(hi32, tnum_intersect(lo32, range)); --} -- - /* Reset the min/max bounds of a register */ - static void __mark_reg_unbounded(struct bpf_reg_state *reg) - { -@@ -5677,10 +5666,6 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg, - /* We might have learned some bits from the bounds. */ - __reg_bound_offset(false_reg); - __reg_bound_offset(true_reg); -- if (is_jmp32) { -- __reg_bound_offset32(false_reg); -- __reg_bound_offset32(true_reg); -- } - /* Intersecting with the old var_off might have improved our bounds - * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), - * then new var_off is (0; 0x7f...fc) which improves our umax. -@@ -5790,10 +5775,6 @@ static void reg_set_min_max_inv(struct bpf_reg_state *true_reg, - /* We might have learned some bits from the bounds. */ - __reg_bound_offset(false_reg); - __reg_bound_offset(true_reg); -- if (is_jmp32) { -- __reg_bound_offset32(false_reg); -- __reg_bound_offset32(true_reg); -- } - /* Intersecting with the old var_off might have improved our bounds - * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), - * then new var_off is (0; 0x7f...fc) which improves our umax. --- -2.26.0 - @@ -61,8 +61,8 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.5.13 -pkgrel=2 +pkgver=5.5.14 +pkgrel=1 _ckpatchversion=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -89,13 +89,12 @@ source=( 0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch 0010-drm-i915-Introduce-a-vma.kref.patch 0011-iwlwifi-don-t-send-GEO_TX_POWER_LIMIT-if-no-wgds-tab.patch -0012-Revert-bpf-Provide-better-register-bounds-after-jmp3.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('1f3b3614a06bffc9c621c82f98d8ca88c60538a8c6dd77f96f2e7fee310a4ee2' +sha256sums=('4c529e4e100df11887e0a789d0e46d7ffd053e68a0380b6173a3a2799192ef6a' 'SKIP' '0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06' '7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5' @@ -110,8 +109,7 @@ sha256sums=('1f3b3614a06bffc9c621c82f98d8ca88c60538a8c6dd77f96f2e7fee310a4ee2' '70f0e78e7335cb713c06a1e0b886d4c8edebf2048c588f00d12e95c930483cd9' '6d305596dc9be86a65b9200bf69c001a8e4ddd41cad471289c3c769b5530c359' 'a4a10bcb55fc1991200c3835b359b81f5e3e858f5be77c6b9eaef033885c8bfc' - 'a578a12239e39728c63038db6539abcee422bed4d04ee5bf99f6ba5be8884a9a' - '4e59212ab1951d1064132cf54c6531d9245a987648de2cad3ca448ae183a53c7') + 'a578a12239e39728c63038db6539abcee422bed4d04ee5bf99f6ba5be8884a9a') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |