Updated to 5.7.10

4 files changed, 13 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7935d1b13366..64d891c151c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-bcachefs-ck
-	pkgver = 5.7.7
+	pkgver = 5.7.10
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -8,13 +8,11 @@ pkgbase = linux-bcachefs-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.10.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.10.tar.sign
 	source = config
 	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 = https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0002-clear-patches.patch
 	source = https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0003-glitched-base.patch
 	source = https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0004-5.7-ck1.patch
@@ -22,36 +20,20 @@ pkgbase = linux-bcachefs-ck
 	source = https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0006-add-acs-overrides_iommu.patch
 	source = https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0007-v5.7-fsync.patch
 	source = https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0008-5.7-bcachefs.patch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/PATCH-RFC-x86-mm-pat-Restore-large-pages-after-fragmentation.mypatch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/Reduce-lock-contention-on-swap-cache-from-swap-slots-allocation.mypatch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/The-new-cgroup-slab-memory-controller.mypatch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/async_buffered_reads.mypatch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/mm_proactive_compaction.mypatch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/workingset_protection.mypatch
-	source = https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/zstd.mypatch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	md5sums = 11c4b191621d4ad02f56b0cca2fc6b57
+	md5sums = 95c1040a9b8b7c08b5bd607981e0427d
 	md5sums = SKIP
 	md5sums = dd2441189c14b66f1f051121d5602345
 	md5sums = 2cebdad39da582fd6a0c01746c8adb42
 	md5sums = cb960fcd1691d360491ed5c97a63a032
-	md5sums = 6a96f2990de31babd87209316fcc8c19
-	md5sums = ec22107609653d065a65077d4e076a16
 	md5sums = b10e4c612d5240d66fad8f1c50fe3242
-	md5sums = b69a31e8099f3337fe3968864e404108
+	md5sums = a22cddcadc0da933dac13a6ab49b7ed9
 	md5sums = aa8f5bb0b644cbef02c4d55c3956026a
 	md5sums = 75602fa70033aef9cb42f3df16ec2eb3
 	md5sums = 168a924c7c83ecdc872a9a1c6d1c8bdb
 	md5sums = 228b33d0cb13cab162b3e051ec9bb88d
 	md5sums = 0633bf8f7561c6903b445ff476815dc0
-	md5sums = f6b397e82f0433178e8e4a9c45a20e62
-	md5sums = a6106ab8f5e3a275d911daa7f439e576
-	md5sums = 7e050ca812e2bc0a1a2d108c3a14bc98
-	md5sums = 0c8cc772b48fcd317b62af52a99822a6
-	md5sums = 83b1f3f9cdedb189310f8e4228cdc2c0
-	md5sums = 5d7807c86a391e393e813638333c0d3b
-	md5sums = 2710fa5003f9babdea3815bf17bcba2d
 
 pkgname = linux-bcachefs-ck
 	pkgdesc = The Linux-bcachefs-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -60,11 +42,11 @@ pkgname = linux-bcachefs-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-bcachefs-ck=5.7.7
+	provides = linux-bcachefs-ck=5.7.10
 
 pkgname = linux-bcachefs-ck-headers
 	pkgdesc = Headers and scripts for building modules for Linux-bcachefs-ck kernel
 	depends = linux-bcachefs-ck
-	provides = linux-bcachefs-ck-headers=5.7.7
-	provides = linux-headers=5.7.7
+	provides = linux-bcachefs-ck-headers=5.7.10
+	provides = linux-headers=5.7.10
 
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
deleted file mode 100644
index 5d0c5c5ca6d8..000000000000
--- a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6535fe9061b6f1ce76ac658ae34b85fb3ed38ad9 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
-
-Previously we logged *all* ACPI SYSTEM-level events, which may include lots
-of non-EDR events.  Move the message so we only log those related to EDR.
-
-Link: https://lore.kernel.org/r/01afb4e01efbe455de0c445bef6cf3ffc59340d2.1586996350.git.sathyanarayanan.kuppuswamy@linux.intel.com
-[bhelgaas: drop the pci_dbg() of all events since ACPI can log those
-already]
-Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
----
- drivers/pci/pcie/edr.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pci/pcie/edr.c b/drivers/pci/pcie/edr.c
-index 594622a6cb16..a6b9b479b97a 100644
---- a/drivers/pci/pcie/edr.c
-+++ b/drivers/pci/pcie/edr.c
-@@ -148,11 +148,11 @@ static void edr_handle_event(acpi_handle handle, u32 event, void *data)
- 	pci_ers_result_t estate = PCI_ERS_RESULT_DISCONNECT;
- 	u16 status;
- 
--	pci_info(pdev, "ACPI event %#x received\n", event);
--
- 	if (event != ACPI_NOTIFY_DISCONNECT_RECOVER)
- 		return;
- 
-+	pci_info(pdev, "EDR event received\n");
-+
- 	/* Locate the port which issued EDR event */
- 	edev = acpi_dpc_port_get(pdev);
- 	if (!edev) {
--- 
-2.27.0
-
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/PKGBUILD b/PKGBUILD
index 5fb8ccdbbe2c..a18250157f6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -63,8 +63,8 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-bcachefs-ck
-pkgver=5.7.7
-_pkgverpntrel=7
+pkgver=5.7.10
+_pkgverpntrel=10
 pkgrel=1
 _ckpatchversion=1
 _cpusched="MuQSS"
@@ -89,8 +89,6 @@ source=(
   config
   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
   "https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0002-clear-patches.patch"
   "https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0003-glitched-base.patch"
   "https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0004-5.7-ck1.patch"
@@ -98,13 +96,6 @@ source=(
   "https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0006-add-acs-overrides_iommu.patch"
   "https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0007-v5.7-fsync.patch"
   "https://github.com/Frogging-Family/linux-tkg/raw/master/linux57-tkg/linux57-tkg-patches/0008-5.7-bcachefs.patch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/PATCH-RFC-x86-mm-pat-Restore-large-pages-after-fragmentation.mypatch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/Reduce-lock-contention-on-swap-cache-from-swap-slots-allocation.mypatch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/The-new-cgroup-slab-memory-controller.mypatch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/async_buffered_reads.mypatch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/mm_proactive_compaction.mypatch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/workingset_protection.mypatch"
-  "https://github.com/Frogging-Family/community-patches/blob/master/linux57-tkg/zstd.mypatch"
 )
 
 
@@ -112,27 +103,18 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-md5sums=('11c4b191621d4ad02f56b0cca2fc6b57'
+md5sums=('95c1040a9b8b7c08b5bd607981e0427d'
          'SKIP'
          'dd2441189c14b66f1f051121d5602345'
          '2cebdad39da582fd6a0c01746c8adb42'
          'cb960fcd1691d360491ed5c97a63a032'
-         '6a96f2990de31babd87209316fcc8c19'
-         'ec22107609653d065a65077d4e076a16'
          'b10e4c612d5240d66fad8f1c50fe3242'
-         'b69a31e8099f3337fe3968864e404108'
+         'a22cddcadc0da933dac13a6ab49b7ed9'
          'aa8f5bb0b644cbef02c4d55c3956026a'
          '75602fa70033aef9cb42f3df16ec2eb3'
          '168a924c7c83ecdc872a9a1c6d1c8bdb'
          '228b33d0cb13cab162b3e051ec9bb88d'
-         '0633bf8f7561c6903b445ff476815dc0'
-         'f6b397e82f0433178e8e4a9c45a20e62'
-         'a6106ab8f5e3a275d911daa7f439e576'
-         '7e050ca812e2bc0a1a2d108c3a14bc98'
-         '0c8cc772b48fcd317b62af52a99822a6'
-         '83b1f3f9cdedb189310f8e4228cdc2c0'
-         '5d7807c86a391e393e813638333c0d3b'
-         '2710fa5003f9babdea3815bf17bcba2d')
+         '0633bf8f7561c6903b445ff476815dc0')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -176,10 +158,6 @@ prepare() {
   
   patch -Np1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   
-  patch -Np1 -i ../0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
-  
-  patch -Np1 -i ../0003-ALSA-usb-audio-Fix-packet-size-calculation.patch
-  
     # TkG
   patch -Np1 -i ../0002-clear-patches.patch