summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO36
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch2
-rw-r--r--0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch2
-rw-r--r--0003-ALSA-usb-audio-Fix-packet-size-calculation.patch35
-rw-r--r--0003-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch200
-rw-r--r--0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch43
-rw-r--r--0004-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch31
-rw-r--r--0005-Arch-Linux-kernel-v5.7.8-arch1.patch25
-rw-r--r--PKGBUILD29
9 files changed, 295 insertions, 108 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25fc1f607d22..355d4dc18666 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 5.7.7
+ pkgver = 5.7.8
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -8,30 +8,34 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.7.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.7.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.8.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.8.tar.sign
source = config
- source = 0000-sphinx-workaround.patch
source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.7/5.7-ck1/patch-5.7-ck1.xz
+ source = unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch
+ source = unfuck-ck1-fix-suspend-to-ram.patch::https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch
+ source = 0000-sphinx-workaround.patch
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
- source = 0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
- source = 0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
- source = unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch
+ source = 0003-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
+ source = 0004-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
+ source = 0005-Arch-Linux-kernel-v5.7.8-arch1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = f840b9679283343c165516585c3070ebb277528721c890e9410a58e9d071ee7f
+ sha256sums = afb577b88e400758ea64109937bb514ab8171fe9c5613138928ac232a3844dc6
sha256sums = SKIP
sha256sums = ed60b20ee841e16038da0d145fbf3f53fac94122c4001d6cd03abe64e9e760f6
- sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90
sha256sums = e4a201e984cf229b66fbab713c49fa3a0e0e8f238f2216e503f9452a7a7a5e06
- sha256sums = 1716e59693757f339fda588b268ff6f5edc3f2ad61bbe8a61832692572e25b1a
- sha256sums = 040420a533f7024b49633c4cf397ec95e9c915827e6230abe99890fcd769b009
- sha256sums = 97a961d9394fcfed39986798432a4170a8dd460d26eeef4c992810f1680e7f9c
- sha256sums = cf50d4a3f343074bfacca9b148df7b034c15732057ada962fb73c94d80bb1229
sha256sums = 5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328
+ sha256sums = 961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558
+ sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
+ sha256sums = 42ae58801f336060edb644d87893c84bad689546f0504f19a03bfe350fb16dc8
+ sha256sums = 504bb0b670eb8786fc9da0928db0dcb4e302e43ab8bd398f54e33ac860bd1c60
+ sha256sums = e0612815268040772a49e7730521573b91efb495e7308ad707a74f3a7c3e04ef
+ sha256sums = 32179d328fcffbff4b7f4d7b54d53da799d8086dac867c6ee5a241c20f5e6fb4
+ sha256sums = 10087dc38ef6115625ebaa8906b4a9619f1629d4745b0a5a9f402c4575f74ad6
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -40,11 +44,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.7.7
+ provides = linux-ck=5.7.8
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.7.7
- provides = linux-headers=5.7.7
+ provides = linux-ck-headers=5.7.8
+ provides = linux-headers=5.7.8
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 69b4fe4e2e43..5b038e7160f1 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,4 +1,4 @@
-From a62bbaf1ba0f5e2c498fa9b3ae295aa166d4bb8e Mon Sep 17 00:00:00 2001
+From 164d2dd36ff81a5a4b4d6440317438cf6009cd59 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
diff --git a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch b/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
index 5d0c5c5ca6d8..4e492d8ab0b7 100644
--- a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
+++ b/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
@@ -1,4 +1,4 @@
-From 6535fe9061b6f1ce76ac658ae34b85fb3ed38ad9 Mon Sep 17 00:00:00 2001
+From efc6c7bfa6d28f7720322f1976aa2799a88906dd Mon Sep 17 00:00:00 2001
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Date: Wed, 15 Apr 2020 17:38:32 -0700
Subject: [PATCH 2/5] PCI/EDR: Log only ACPI_NOTIFY_DISCONNECT_RECOVER events
diff --git a/0003-ALSA-usb-audio-Fix-packet-size-calculation.patch b/0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
deleted file mode 100644
index 78649ca37b6a..000000000000
--- a/0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 17c5f7dd425becd30c4a2dafaecb054641a1fdc9 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 29 Jun 2020 05:59:33 +0300
-Subject: [PATCH 3/5] ALSA: usb-audio: Fix packet size calculation
-
-Commit f0bd62b64016 ("ALSA: usb-audio: Improve frames size computation")
-introduced a regression for devices which have playback endpoints with
-bInterval > 1. Fix this by taking ep->datainterval into account.
-
-Note that frame and fps are actually mean packet and packets per second
-in the code introduces by the mentioned commit. This will be fixed in a
-follow-up patch.
-
-Fixes: f0bd62b64016 ("ALSA: usb-audio: Improve frames size computation")
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208353
-Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
----
- sound/usb/endpoint.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
-index 9bea7d3f99f8..11f23778f0a5 100644
---- a/sound/usb/endpoint.c
-+++ b/sound/usb/endpoint.c
-@@ -1093,6 +1093,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
- ep->freqn = get_usb_high_speed_rate(rate);
- ep->fps = 8000;
- }
-+ ep->fps >>= ep->datainterval;
-
- ep->sample_rem = rate % ep->fps;
- ep->framesize[0] = rate / ep->fps;
---
-2.27.0
-
diff --git a/0003-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch b/0003-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
new file mode 100644
index 000000000000..ea2d5a5f69e5
--- /dev/null
+++ b/0003-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
@@ -0,0 +1,200 @@
+From 1a32e7b57b0b37cab6845093920b4d1ff94d3bf4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Viktor=20J=C3=A4gersk=C3=BCpper?=
+ <viktor_jaegerskuepper@freenet.de>
+Date: Wed, 1 Jul 2020 23:32:28 +0200
+Subject: [PATCH 3/5] Revert "ath9k: Fix general protection fault in
+ ath9k_hif_usb_rx_cb"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 2bbcaaee1fcb ("ath9k: Fix general protection fault
+in ath9k_hif_usb_rx_cb") because the driver gets stuck like this:
+
+ [ 5.778803] usb 1-5: Manufacturer: ATHEROS
+ [ 21.697488] usb 1-5: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw requested
+ [ 21.701377] usbcore: registered new interface driver ath9k_htc
+ [ 22.053705] usb 1-5: ath9k_htc: Transferred FW: ath9k_htc/htc_9271-1.4.0.fw, size: 51008
+ [ 22.306182] ath9k_htc 1-5:1.0: ath9k_htc: HTC initialized with 33 credits
+ [ 115.708513] ath9k_htc: Failed to initialize the device
+ [ 115.708683] usb 1-5: ath9k_htc: USB layer deinitialized
+
+Reported-by: Roman Mamedov <rm@romanrm.net>
+Ref: https://bugzilla.kernel.org/show_bug.cgi?id=208251
+Fixes: 2bbcaaee1fcb ("ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb")
+Tested-by: Viktor Jägersküpper <viktor_jaegerskuepper@freenet.de>
+Signed-off-by: Viktor Jägersküpper <viktor_jaegerskuepper@freenet.de>
+---
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 48 ++++++------------------
+ drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ---
+ 2 files changed, 11 insertions(+), 42 deletions(-)
+
+diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
+index 4ed21dad6a8e..6049d3766c64 100644
+--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
+@@ -643,9 +643,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
+
+ static void ath9k_hif_usb_rx_cb(struct urb *urb)
+ {
+- struct rx_buf *rx_buf = (struct rx_buf *)urb->context;
+- struct hif_device_usb *hif_dev = rx_buf->hif_dev;
+- struct sk_buff *skb = rx_buf->skb;
++ struct sk_buff *skb = (struct sk_buff *) urb->context;
++ struct hif_device_usb *hif_dev =
++ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
+ int ret;
+
+ if (!skb)
+@@ -685,15 +685,14 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)
+ return;
+ free:
+ kfree_skb(skb);
+- kfree(rx_buf);
+ }
+
+ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
+ {
+- struct rx_buf *rx_buf = (struct rx_buf *)urb->context;
+- struct hif_device_usb *hif_dev = rx_buf->hif_dev;
+- struct sk_buff *skb = rx_buf->skb;
++ struct sk_buff *skb = (struct sk_buff *) urb->context;
+ struct sk_buff *nskb;
++ struct hif_device_usb *hif_dev =
++ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
+ int ret;
+
+ if (!skb)
+@@ -751,7 +750,6 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
+ return;
+ free:
+ kfree_skb(skb);
+- kfree(rx_buf);
+ urb->context = NULL;
+ }
+
+@@ -797,7 +795,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev)
+ init_usb_anchor(&hif_dev->mgmt_submitted);
+
+ for (i = 0; i < MAX_TX_URB_NUM; i++) {
+- tx_buf = kzalloc(sizeof(*tx_buf), GFP_KERNEL);
++ tx_buf = kzalloc(sizeof(struct tx_buf), GFP_KERNEL);
+ if (!tx_buf)
+ goto err;
+
+@@ -834,9 +832,8 @@ static void ath9k_hif_usb_dealloc_rx_urbs(struct hif_device_usb *hif_dev)
+
+ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
+ {
+- struct rx_buf *rx_buf = NULL;
+- struct sk_buff *skb = NULL;
+ struct urb *urb = NULL;
++ struct sk_buff *skb = NULL;
+ int i, ret;
+
+ init_usb_anchor(&hif_dev->rx_submitted);
+@@ -844,12 +841,6 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
+
+ for (i = 0; i < MAX_RX_URB_NUM; i++) {
+
+- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);
+- if (!rx_buf) {
+- ret = -ENOMEM;
+- goto err_rxb;
+- }
+-
+ /* Allocate URB */
+ urb = usb_alloc_urb(0, GFP_KERNEL);
+ if (urb == NULL) {
+@@ -864,14 +855,11 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
+ goto err_skb;
+ }
+
+- rx_buf->hif_dev = hif_dev;
+- rx_buf->skb = skb;
+-
+ usb_fill_bulk_urb(urb, hif_dev->udev,
+ usb_rcvbulkpipe(hif_dev->udev,
+ USB_WLAN_RX_PIPE),
+ skb->data, MAX_RX_BUF_SIZE,
+- ath9k_hif_usb_rx_cb, rx_buf);
++ ath9k_hif_usb_rx_cb, skb);
+
+ /* Anchor URB */
+ usb_anchor_urb(urb, &hif_dev->rx_submitted);
+@@ -897,8 +885,6 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
+ err_skb:
+ usb_free_urb(urb);
+ err_urb:
+- kfree(rx_buf);
+-err_rxb:
+ ath9k_hif_usb_dealloc_rx_urbs(hif_dev);
+ return ret;
+ }
+@@ -910,21 +896,14 @@ static void ath9k_hif_usb_dealloc_reg_in_urbs(struct hif_device_usb *hif_dev)
+
+ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
+ {
+- struct rx_buf *rx_buf = NULL;
+- struct sk_buff *skb = NULL;
+ struct urb *urb = NULL;
++ struct sk_buff *skb = NULL;
+ int i, ret;
+
+ init_usb_anchor(&hif_dev->reg_in_submitted);
+
+ for (i = 0; i < MAX_REG_IN_URB_NUM; i++) {
+
+- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);
+- if (!rx_buf) {
+- ret = -ENOMEM;
+- goto err_rxb;
+- }
+-
+ /* Allocate URB */
+ urb = usb_alloc_urb(0, GFP_KERNEL);
+ if (urb == NULL) {
+@@ -939,14 +918,11 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
+ goto err_skb;
+ }
+
+- rx_buf->hif_dev = hif_dev;
+- rx_buf->skb = skb;
+-
+ usb_fill_int_urb(urb, hif_dev->udev,
+ usb_rcvintpipe(hif_dev->udev,
+ USB_REG_IN_PIPE),
+ skb->data, MAX_REG_IN_BUF_SIZE,
+- ath9k_hif_usb_reg_in_cb, rx_buf, 1);
++ ath9k_hif_usb_reg_in_cb, skb, 1);
+
+ /* Anchor URB */
+ usb_anchor_urb(urb, &hif_dev->reg_in_submitted);
+@@ -972,8 +948,6 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
+ err_skb:
+ usb_free_urb(urb);
+ err_urb:
+- kfree(rx_buf);
+-err_rxb:
+ ath9k_hif_usb_dealloc_reg_in_urbs(hif_dev);
+ return ret;
+ }
+diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
+index 5985aa15ca93..a94e7e1c86e9 100644
+--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
++++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
+@@ -86,11 +86,6 @@ struct tx_buf {
+ struct list_head list;
+ };
+
+-struct rx_buf {
+- struct sk_buff *skb;
+- struct hif_device_usb *hif_dev;
+-};
+-
+ #define HIF_USB_TX_STOP BIT(0)
+ #define HIF_USB_TX_FLUSH BIT(1)
+
+--
+2.27.0
+
diff --git a/0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch b/0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
deleted file mode 100644
index a1acdd3d2e53..000000000000
--- a/0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7fab9d4206e54d19b578c70cd0529045ad642f25 Mon Sep 17 00:00:00 2001
-From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-Date: Mon, 29 Jun 2020 13:03:52 -0400
-Subject: [PATCH 4/5] drm/amd/display: Only revalidate bandwidth on medium and
- fast updates
-
-[Why]
-Changes that are fast don't require updating DLG parameters making
-this call unnecessary. Considering this is an expensive call it should
-not be done on every flip.
-
-[How]
-Guard the validation to only happen if update type isn't FAST.
-
-Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
----
- drivers/gpu/drm/amd/display/dc/core/dc.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
-index 4acaf4be8a81..c825d383f0f1 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -2533,10 +2533,12 @@ void dc_commit_updates_for_stream(struct dc *dc,
-
- copy_stream_update_to_stream(dc, context, stream, stream_update);
-
-- if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
-- DC_ERROR("Mode validation failed for stream update!\n");
-- dc_release_state(context);
-- return;
-+ if (update_type > UPDATE_TYPE_FAST) {
-+ if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
-+ DC_ERROR("Mode validation failed for stream update!\n");
-+ dc_release_state(context);
-+ return;
-+ }
- }
-
- commit_planes_for_stream(
---
-2.27.0
-
diff --git a/0004-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch b/0004-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
new file mode 100644
index 000000000000..98efe40809a7
--- /dev/null
+++ b/0004-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
@@ -0,0 +1,31 @@
+From 2fadccbdd143a95db9ba06110261142c9bb2acbd Mon Sep 17 00:00:00 2001
+From: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>
+Date: Thu, 2 Jul 2020 17:05:52 +0200
+Subject: [PATCH 4/5] iwlwifi: Make some Killer Wireless-AC 1550 cards working
+ again
+
+Fix the regression introduced by commit c8685937d07f ("iwlwifi: move pu devices to new table") by add the ids and the configurations of two missing Killer 1550 cards in order to make these cards being configured and working correctly again (following the new table convention).
+Resolve bug 208141 ("Wireless ac 9560 not working kernel 5.7.2", https://bugzilla.kernel.org/show_bug.cgi?id=208141).
+
+Fixes: c8685937d07f ("iwlwifi: move pu devices to new table")
+Signed-off-by: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>
+---
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+index 29971c25dba4..9ea3e5634672 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+@@ -577,6 +577,8 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
+ IWL_DEV_INFO(0x30DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
+ IWL_DEV_INFO(0x31DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
+ IWL_DEV_INFO(0x31DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
++ IWL_DEV_INFO(0xA370, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
++ IWL_DEV_INFO(0xA370, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
+
+ IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),
+
+--
+2.27.0
+
diff --git a/0005-Arch-Linux-kernel-v5.7.8-arch1.patch b/0005-Arch-Linux-kernel-v5.7.8-arch1.patch
new file mode 100644
index 000000000000..7aa542cb7a10
--- /dev/null
+++ b/0005-Arch-Linux-kernel-v5.7.8-arch1.patch
@@ -0,0 +1,25 @@
+From 112c2ecc87cc4769c0c4b31a7d33685bcb7bac99 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Thu, 9 Jul 2020 18:26:09 +0200
+Subject: [PATCH 5/5] Arch Linux kernel v5.7.8-arch1
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 6163d607ca72..5112988d9e10 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ VERSION = 5
+ PATCHLEVEL = 7
+ SUBLEVEL = 8
+-EXTRAVERSION =
++EXTRAVERSION = -arch1
+ NAME = Kleptomaniac Octopus
+
+ # *DOCUMENTATION*
+--
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 120c40a00bdc..2fd686f26f58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,7 +64,7 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.7.7
+pkgver=5.7.8
pkgrel=1
_ckpatchversion=1
arch=(x86_64)
@@ -79,30 +79,34 @@ _gcc_more_v='20200615'
source=(
"https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar".{xz,sign}
config # the main kernel config file
- 0000-sphinx-workaround.patch
"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.7/5.7-ck${_ckpatchversion}/$_ckpatch.xz"
+ "unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch"
+ "unfuck-ck1-fix-suspend-to-ram.patch::https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch"
+ 0000-sphinx-workaround.patch
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
- 0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
- 0004-drm-amd-display-Only-revalidate-bandwidth-on-medium-.patch
- "unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch"
+ 0003-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
+ 0004-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
+ 0005-Arch-Linux-kernel-v5.7.8-arch1.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('f840b9679283343c165516585c3070ebb277528721c890e9410a58e9d071ee7f'
+sha256sums=('afb577b88e400758ea64109937bb514ab8171fe9c5613138928ac232a3844dc6'
'SKIP'
'ed60b20ee841e16038da0d145fbf3f53fac94122c4001d6cd03abe64e9e760f6'
- '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90'
'e4a201e984cf229b66fbab713c49fa3a0e0e8f238f2216e503f9452a7a7a5e06'
- '1716e59693757f339fda588b268ff6f5edc3f2ad61bbe8a61832692572e25b1a'
- '040420a533f7024b49633c4cf397ec95e9c915827e6230abe99890fcd769b009'
- '97a961d9394fcfed39986798432a4170a8dd460d26eeef4c992810f1680e7f9c'
- 'cf50d4a3f343074bfacca9b148df7b034c15732057ada962fb73c94d80bb1229'
- '5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328')
+ '5a08ac04975fe784d16d6c8ec2be733c73cdcfc19795f5c7b97d7a1aa7f12328'
+ '961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558'
+ '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
+ '42ae58801f336060edb644d87893c84bad689546f0504f19a03bfe350fb16dc8'
+ '504bb0b670eb8786fc9da0928db0dcb4e302e43ab8bd398f54e33ac860bd1c60'
+ 'e0612815268040772a49e7730521573b91efb495e7308ad707a74f3a7c3e04ef'
+ '32179d328fcffbff4b7f4d7b54d53da799d8086dac867c6ee5a241c20f5e6fb4'
+ '10087dc38ef6115625ebaa8906b4a9619f1629d4745b0a5a9f402c4575f74ad6')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
@@ -152,6 +156,7 @@ prepare() {
# ck patchset itself
patch -Np1 -i ../"${_ckpatch}"
patch -Np1 -i ../unfuck-ck1.patch
+ patch -Np1 -i ../unfuck-ck1-fix-suspend-to-ram.patch
# non-interactively apply ck1 default options
# this isn't redundant if we want a clean selection of subarch below