summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-15 10:15:22 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-15 10:15:22 +0200
commit713b9c960f4d81c19aa532e2956c6dfc6b94ecc1 (patch)
tree78c586b2b30f858ddd0bc410938fbb53c5f0e8de
parent45b946d40d8113d3e26a17881b030635184990b4 (diff)
parent9939e73442d900399a4caab7d70ebb2ff9f4a9d2 (diff)
downloadkernel-713b9c960f4d81c19aa532e2956c6dfc6b94ecc1.tar.gz
kernel-713b9c960f4d81c19aa532e2956c6dfc6b94ecc1.tar.xz
kernel-713b9c960f4d81c19aa532e2956c6dfc6b94ecc1.zip
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec7
-rw-r--r--patch-5.14-redhat.patch2
-rw-r--r--sources6
3 files changed, 9 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 64fae65d6..ee5fc3ca0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2963,10 +2963,13 @@ fi
#
#
%changelog
-* Wed Sep 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.2-0]
+* Sun Sep 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.3-300]
+- Linux v5.14.3
+
+* Wed Sep 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.2-300]
- Revert "team: mark team driver as deprecated" (Justin M. Forbes)
-* Fri Sep 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.1-0]
+* Fri Sep 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.1-300]
- Setup for building fedora-5.14 branch (Justin M. Forbes)
* Mon Aug 30 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14-0]
diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch
index 0bdb9dfad..605a1886e 100644
--- a/patch-5.14-redhat.patch
+++ b/patch-5.14-redhat.patch
@@ -1295,7 +1295,7 @@ index 0b8a0cd3b652..6f49950a5f6d 100644
IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL),
IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL),
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index ab3de1551b50..7bc8ebb58d35 100644
+index 7b1c81b899cd..5904ece27f64 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4231,6 +4231,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
diff --git a/sources b/sources
index a1463c101..c1323b049 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.2.tar.xz) = baefe357d9a9d4d8f2ba8b2b1f1ac3edda671b9ca31d675944af295ff752bffadfce51dd968d33a4876ef150d04ac299f63ecc41468a8bf32f1f9a4edd13ea34
-SHA512 (kernel-abi-stablelists-5.14.2-300.tar.bz2) = 418b6b773015e3901e377e5645952bb2f1556c7136134fbc90120aec54854dac03dedbe8367216ca97b9f332b3155f7ba8d3edf96680d88d9d6d39fd64ff9f82
-SHA512 (kernel-kabi-dw-5.14.2-300.tar.bz2) = e224ed2aa1feadfdda661019280b36b55d4ee113217fc8b348645ed6100f81d22663e2fe4e39d8d7574dbe2bac863264cc6407633e5a332f4fc739650d5cec73
+SHA512 (linux-5.14.3.tar.xz) = 7926aed288b696d912de9b758fdb2fef222649dd8c5389f3c43bfb39fbe9850f6b44b84e3da1f34d47f7276b8d3633438bd0b19c66fa8f8cd87ecfd6345a65dd
+SHA512 (kernel-abi-stablelists-5.14.3-300.tar.bz2) = 2247682863a210e429db5e0483a25ec7504a9a711574d5c34a3d5cd42c735774fa6dd579b3627bee9a71ac73431b64526d43824a68330ac67d36e1b58b345efa
+SHA512 (kernel-kabi-dw-5.14.3-300.tar.bz2) = fc6a63d92e1bd593e22e916ba0278e8900fe67f8aa97c0516fd159350012878cede9f625ecb5d2933ad02bca3e9984f4bae4f7e1b8ba2e59744f81c7c40e0ac4