summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-07-29 11:14:33 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-07-29 11:14:33 -0500
commit7b5ab8004d31076ea9035418b0073361c9859b00 (patch)
tree9ee7bd0ee28fa13c0e4a8228d31d2fa9e6dbd227
parentf0792f689d9a83e2f28a9e00495ff2569aeeb521 (diff)
downloadkernel-7b5ab8004d31076ea9035418b0073361c9859b00.tar.gz
kernel-7b5ab8004d31076ea9035418b0073361c9859b00.tar.xz
kernel-7b5ab8004d31076ea9035418b0073361c9859b00.zip
Linux v5.7.11
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch46
-rw-r--r--kernel.spec12
-rw-r--r--sources2
3 files changed, 9 insertions, 51 deletions
diff --git a/iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch b/iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch
deleted file mode 100644
index 8bbbd79e7..000000000
--- a/iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From MAILER-DAEMON Wed Jul 15 12:54:09 2020
-From: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>
-To: linux-wireless@vger.kernel.org
-Cc: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>, Johannes Berg <johannes.berg@intel.com>, Emmanuel Grumbach <emmanuel.grumbach@intel.com>, Luca Coelho <luciano.coelho@intel.com>, Intel Linux Wireless <linuxwifi@intel.com>
-Subject: [PATCH v2] iwlwifi: Make some Killer Wireless-AC 1550 cards work again
-Date: Tue, 14 Jul 2020 11:19:11 +0200
-Message-Id: <20200714091911.4442-1-alessio.bonfiglio@mail.polimi.it>
-In-Reply-To: <87imeqcwbt.fsf@tynnyri.adurom.net>
-References: <87imeqcwbt.fsf@tynnyri.adurom.net>
-Sender: linux-wireless-owner@vger.kernel.org
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless@vger.kernel.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-
-Fix the regression introduced by commit c8685937d07f ("iwlwifi: move
-pu devices to new table") by adding the ids and the configurations of
-two missing Killer 1550 cards in order to configure and let them work
-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 65d65c6baf4c..e02bafb8921f 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-@@ -582,6 +582,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/kernel.spec b/kernel.spec
index 4d205a2ef..b5bf90521 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 201
+%global baserelease 200
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -92,7 +92,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 11
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -883,8 +883,8 @@ Patch123: 0001-usb-fusb302-Convert-to-use-GPIO-descriptors.patch
# Tegra194 ACPI PCI quirk - http://patchwork.ozlabs.org/patch/1221384/
Patch124: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch
-# Killer wireless headed to stable
-Patch125: iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch
+# rhbz 1857101
+Patch125: 0001-ALSA-hda-Workaround-for-spurious-wakeups-on-some-Int.patch
# END OF PATCH DEFINITIONS
@@ -2990,6 +2990,10 @@ fi
#
#
%changelog
+* Wed Jul 29 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.11-200
+- Linux v5.7.11
+- Fix rhbz 1857101
+
* Wed Jul 22 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.10-201
- Linux v5.7.10
diff --git a/sources b/sources
index 55aacda79..b2cf6a256 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.7.tar.xz) = 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
-SHA512 (patch-5.7.10.xz) = 700c61fea0e290f94229e1be317bea69f150f5a7b74c8e93fef7a54e0bf3a3f170605b6bbcee98bb65bcbeb1f63a8c79aa0ed51d39b9bb4ead4d12928b73eab1
+SHA512 (patch-5.7.11.xz) = 1200b91a83d43fab4e5b1a6a9f412a6f5bc4facf11a797c4bd98aafca82bd8be8045ee4af4ca4aff0921288c30256a452045b82c07bc55dcf67d6d5a25948bf4