Bump

4 files changed, 14 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c145d18a948d..cc938030787f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,8 +13,6 @@ pkgbase = linux-mainline-bcachefs
 	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-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.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/0006-add-acs-overrides_iommu.patch
@@ -34,20 +32,18 @@ pkgbase = linux-mainline-bcachefs
 	md5sums = e3a9e13a40131b4f10a7a0432316517e
 	md5sums = 2cebdad39da582fd6a0c01746c8adb42
 	md5sums = 3f9c557e2cad81e821c213e4e1097080
-	md5sums = b5140bcd7c4bc9a826db47808d0fde99
-	md5sums = 2ef13b0799bd9b9b994389907812e7a7
 	md5sums = b10e4c612d5240d66fad8f1c50fe3242
 	md5sums = a22cddcadc0da933dac13a6ab49b7ed9
 	md5sums = 168a924c7c83ecdc872a9a1c6d1c8bdb
 	md5sums = 228b33d0cb13cab162b3e051ec9bb88d
 	md5sums = 0633bf8f7561c6903b445ff476815dc0
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	md5sums = f0388b40aa60578420c16b3df3433f51
+	md5sums = 1ade0f572d9b80322aa75266303c9edd
+	md5sums = b0f08af39185bcbc8c05192ed3cf9c50
+	md5sums = 534f3ed596d174ef656f1f220b0363d0
+	md5sums = 0300567e972e70cf30043e2563b0757f
+	md5sums = 927205ff32b2a8dda9588a347e885949
+	md5sums = 7af9ba6d5037bf6395e9295c3b6b5641
 
 pkgname = linux-mainline-bcachefs
 	pkgdesc = The Linux-mainline-bcachefs kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
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 4e492d8ab0b7..000000000000
--- a/0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
-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-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch b/0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
deleted file mode 100644
index a8a0f5c237cc..000000000000
--- a/0003-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b2fd0d69f3b155b0c575dd540ad354e4b5323034 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 3/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/PKGBUILD b/PKGBUILD
index e994d2fcaa4b..d082ff719567 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -86,8 +86,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-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.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/0006-add-acs-overrides_iommu.patch"
@@ -111,20 +109,18 @@ md5sums=('95c1040a9b8b7c08b5bd607981e0427d'
          'e3a9e13a40131b4f10a7a0432316517e'
          '2cebdad39da582fd6a0c01746c8adb42'
          '3f9c557e2cad81e821c213e4e1097080'
-         'b5140bcd7c4bc9a826db47808d0fde99'
-         '2ef13b0799bd9b9b994389907812e7a7'
          'b10e4c612d5240d66fad8f1c50fe3242'
          'a22cddcadc0da933dac13a6ab49b7ed9'
          '168a924c7c83ecdc872a9a1c6d1c8bdb'
          '228b33d0cb13cab162b3e051ec9bb88d'
          '0633bf8f7561c6903b445ff476815dc0'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP')
+         'f0388b40aa60578420c16b3df3433f51'
+         '1ade0f572d9b80322aa75266303c9edd'
+         'b0f08af39185bcbc8c05192ed3cf9c50'
+         '534f3ed596d174ef656f1f220b0363d0'
+         '0300567e972e70cf30043e2563b0757f'
+         '927205ff32b2a8dda9588a347e885949'
+         '7af9ba6d5037bf6395e9295c3b6b5641')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -168,10 +164,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-iwlwifi-Make-some-Killer-Wireless-AC-1550-cards-work.patch
-    
     # TkG
   patch -Np1 -i ../0002-clear-patches.patch