diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 4 | ||||
| -rw-r--r-- | 0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-sto.patch | 51 | ||||
| -rw-r--r-- | 0002-Revert-drm-amd-display-reuse-current-context-instead.patch (renamed from 0003-Revert-drm-amd-display-reuse-current-context-instead.patch) | 4 | ||||
| -rw-r--r-- | 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch (renamed from 0004-drm-amdgpu-fix-shutdown-with-s0ix.patch) | 4 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
6 files changed, 22 insertions, 77 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.11.1 + pkgver = 5.11.2 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -12,26 +12,24 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.1.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.1.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.tar.sign source = config source = enable_additional_cpu_optimizations-20201113.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20201113.tar.gz source = http://ck.kolivas.org/patches/5.0/5.11/5.11-ck1/patch-5.11-ck1.xz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - source = 0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-sto.patch - source = 0003-Revert-drm-amd-display-reuse-current-context-instead.patch - source = 0004-drm-amdgpu-fix-shutdown-with-s0ix.patch + source = 0002-Revert-drm-amd-display-reuse-current-context-instead.patch + source = 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = a585aa07b5e577bddc8c54086900be6ef768ee71687bcafdb770eef40a3c5aa24ce40ca49d4231645ce3fa2787f8527f68cd5c9fb1f0947c511c759cba957471 + b2sums = 62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc b2sums = SKIP b2sums = e5702f27217c2d23d007fe8c32ec8df39e738acf39c60b2b3d597e2e9d98ca287896646043d4fa35d95c6b8fa115c03a1413ff7c1d76458f99b21b262d7b6f2e b2sums = 7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127 b2sums = 81d948aef4423255ebb4fa9b12c96207af8d14e225cf95d631dfbb1c0e88d31f60f81c2aff63046a78d8daf2601270ebb1d9cfaeccc3e3fdb08dbc430b53aff5 - b2sums = e1d11423a6d62fa566a651dc78fe1c5e297db96733ed15fc6d60d65dbb248a61548362e8693718d05cad2cdb5b89d38b283f99ed82367bcd9b81b34c16cbb8af - b2sums = f8cb61ae284cc4bc0c580fa95e227c9cceb57cc902dfd77e3f4d93937f414ec459570be370ec2ff363b7162ea7d8fe97e477badc08e419776944d559a3bd7ba9 - b2sums = 6dc36e16adee051089c3cebde655e5c2dac361d0886de58d2885750008bef368c5f89d6db21f7a277cf4cdb4f33a4d8eb078df818b512d96f796bf3a53e16b05 - b2sums = ce1688af6068288d37303c406a600e696147d5520017cd32456fd2b5f6df23951fcb01ebb7baf2f4bc307a3399514c46c6650f4dd9e22b9f09588f5c40484e65 + b2sums = 59c8f4d66eeeb5b3f84b17ab81431804ac9334e97cdbf99ff3dd77803ee3af55908d3d3ba0e957093418a7c5805e423ac78dd398ffb64ba6577aa69bfb9cfbe1 + b2sums = 190bf21b37dacf735cd2f91b465757be70ca4016108dbd80a2edd9fa8dd6a0a3c18edea3c044624414af4e85b15f1031468b935d2f9e800e94cc338d7bc33ee7 + b2sums = 51681ca2a0cd97d65710093f1fa917048f270eda815fcc3ffa0b8cb5068a8e6cb1faa57267d31ce687e0dc2a74eb589c87924166a8cf028c6e2c63303426fd03 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 8201a558ded3..ab38fb134382 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From f404f506d02dc8570c1e185882708f7f19549daf Mon Sep 17 00:00:00 2001 +From 2aef6c5fe88b92e9f611ec0b04ab8e023e943cd8 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/5] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. diff --git a/0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-sto.patch b/0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-sto.patch deleted file mode 100644 index 9f86092846eb..000000000000 --- a/0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-sto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 66b6d6c8306329134abeeb26d352f2074b2f0e1e Mon Sep 17 00:00:00 2001 -From: Hui Wang <hui.wang@canonical.com> -Date: Mon, 8 Feb 2021 13:02:37 +0800 -Subject: [PATCH 2/5] Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop - working - -This issue starts from linux-5.10-rc1, I reproduced this issue on my -Dell Inspiron 7447 with BT adapter 0cf3:e005, the kernel will print -out: "Bluetooth: hci0: don't support firmware rome 0x31010000", and -someone else also reported the similar issue to bugzilla #211571. - -I found this is a regression introduced by 'commit b40f58b97386 -("Bluetooth: btusb: Add Qualcomm Bluetooth SoC WCN6855 support"), the -patch assumed that if high ROM version is not zero, it is an adapter -on WCN6855, but many old adapters don't need to load rampatch or nvm, -and they have non-zero high ROM version. - -To fix it, let the driver match the rom_version in the -qca_devices_table first, if there is no entry matched, check the -high ROM version, if it is not zero, we assume this adapter is ready -to work and no need to load rampatch and nvm like previously. - -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211571 -Fixes: b40f58b97386 ("Bluetooth: btusb: Add Qualcomm Bluetooth SoC WCN6855 support") -Signed-off-by: Hui Wang <hui.wang@canonical.com> -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> ---- - drivers/bluetooth/btusb.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 03b83aa91277..32161dd40ed6 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -4069,6 +4069,13 @@ static int btusb_setup_qca(struct hci_dev *hdev) - info = &qca_devices_table[i]; - } - if (!info) { -+ /* If the rom_version is not matched in the qca_devices_table -+ * and the high ROM version is not zero, we assume this chip no -+ * need to load the rampatch and nvm. -+ */ -+ if (ver_rom & ~0xffffU) -+ return 0; -+ - bt_dev_err(hdev, "don't support firmware rome 0x%x", ver_rom); - return -ENODEV; - } --- -2.30.1 - diff --git a/0003-Revert-drm-amd-display-reuse-current-context-instead.patch b/0002-Revert-drm-amd-display-reuse-current-context-instead.patch index fe3b918c46d1..f47295035edb 100644 --- a/0003-Revert-drm-amd-display-reuse-current-context-instead.patch +++ b/0002-Revert-drm-amd-display-reuse-current-context-instead.patch @@ -1,7 +1,7 @@ -From 15de5c46af8af7e21c34a9a1e1027ff4d7fdd93f Mon Sep 17 00:00:00 2001 +From 66128e7bf7011076ebe47fa5d4b18faad8244c5d Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Tue, 9 Feb 2021 17:21:58 -0500 -Subject: [PATCH 3/5] Revert "drm/amd/display: reuse current context instead of +Subject: [PATCH 2/4] Revert "drm/amd/display: reuse current context instead of recreating one" This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68. diff --git a/0004-drm-amdgpu-fix-shutdown-with-s0ix.patch b/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch index 66233c2ef9d0..3b166cd05fcd 100644 --- a/0004-drm-amdgpu-fix-shutdown-with-s0ix.patch +++ b/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch @@ -1,7 +1,7 @@ -From 7e63b4196ca6366bbc43741f340b33988c660c33 Mon Sep 17 00:00:00 2001 +From 04ec031772dd6faf64506c739ce7073b0f91310b Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Thu, 18 Feb 2021 12:05:53 -0500 -Subject: [PATCH 4/5] drm/amdgpu: fix shutdown with s0ix +Subject: [PATCH 3/4] drm/amdgpu: fix shutdown with s0ix For shutdown needs to be handled differently and s0ix. Add a new flag to shutdown and use it to adjust behavior appropriately. @@ -64,7 +64,7 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.11.1 +pkgver=5.11.2 pkgrel=1 _ckpatchversion=1 arch=(x86_64) @@ -82,23 +82,21 @@ source=( "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" "http://ck.kolivas.org/patches/5.0/5.11/5.11-ck${_ckpatchversion}/$_ckpatch.xz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-sto.patch - 0003-Revert-drm-amd-display-reuse-current-context-instead.patch - 0004-drm-amdgpu-fix-shutdown-with-s0ix.patch + 0002-Revert-drm-amd-display-reuse-current-context-instead.patch + 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('a585aa07b5e577bddc8c54086900be6ef768ee71687bcafdb770eef40a3c5aa24ce40ca49d4231645ce3fa2787f8527f68cd5c9fb1f0947c511c759cba957471' +b2sums=('62f47c769998fa713cda9024a4ecbe7ba2140acde629082630c2c0b076b4e941b0a1e82f7d2b7cd4ed6e84759ea93de78e212ecbe1341d9055091d26d83286dc' 'SKIP' 'e5702f27217c2d23d007fe8c32ec8df39e738acf39c60b2b3d597e2e9d98ca287896646043d4fa35d95c6b8fa115c03a1413ff7c1d76458f99b21b262d7b6f2e' '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127' '81d948aef4423255ebb4fa9b12c96207af8d14e225cf95d631dfbb1c0e88d31f60f81c2aff63046a78d8daf2601270ebb1d9cfaeccc3e3fdb08dbc430b53aff5' - 'e1d11423a6d62fa566a651dc78fe1c5e297db96733ed15fc6d60d65dbb248a61548362e8693718d05cad2cdb5b89d38b283f99ed82367bcd9b81b34c16cbb8af' - 'f8cb61ae284cc4bc0c580fa95e227c9cceb57cc902dfd77e3f4d93937f414ec459570be370ec2ff363b7162ea7d8fe97e477badc08e419776944d559a3bd7ba9' - '6dc36e16adee051089c3cebde655e5c2dac361d0886de58d2885750008bef368c5f89d6db21f7a277cf4cdb4f33a4d8eb078df818b512d96f796bf3a53e16b05' - 'ce1688af6068288d37303c406a600e696147d5520017cd32456fd2b5f6df23951fcb01ebb7baf2f4bc307a3399514c46c6650f4dd9e22b9f09588f5c40484e65') + '59c8f4d66eeeb5b3f84b17ab81431804ac9334e97cdbf99ff3dd77803ee3af55908d3d3ba0e957093418a7c5805e423ac78dd398ffb64ba6577aa69bfb9cfbe1' + '190bf21b37dacf735cd2f91b465757be70ca4016108dbd80a2edd9fa8dd6a0a3c18edea3c044624414af4e85b15f1031468b935d2f9e800e94cc338d7bc33ee7' + '51681ca2a0cd97d65710093f1fa917048f270eda815fcc3ffa0b8cb5068a8e6cb1faa57267d31ce687e0dc2a74eb589c87924166a8cf028c6e2c63303426fd03') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |