summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-07-31 16:06:25 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-07-31 16:06:25 +0200
commit0d83ba4b9a8347856bcba368ef709b245c50df12 (patch)
tree55557e94ba681d9822f00e607fee55cdd095d7db
parent13279fc48945abcc0b59995ca1bc4566048e080b (diff)
parent0af328919107d8e0004387617bdd7eba17a86dd0 (diff)
downloadkernel-0d83ba4b9a8347856bcba368ef709b245c50df12.zip
kernel-0d83ba4b9a8347856bcba368ef709b245c50df12.tar.gz
kernel-0d83ba4b9a8347856bcba368ef709b245c50df12.tar.xz
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec15
-rw-r--r--patch-5.13-redhat.patch8
-rw-r--r--sources6
3 files changed, 21 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 49681e7..056fe26 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2891,7 +2891,20 @@ fi
#
#
%changelog
-* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.6-100]
+* Sat Jul 31 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.7-100]
+- kernel-5.13.7-0 (Justin M. Forbes)
+- kernel-5.13.6-0 (Justin M. Forbes)
+- kernel-5.13.5-0 (Justin M. Forbes)
+- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes)
+- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes)
+- RHEL configs need this too (Justin M. Forbes)
+- kernel-5.13.4-0 (Justin M. Forbes)
+- Config update for 5.13.4 (Justin M. Forbes)
+- kernel-5.13.3-0 (Justin M. Forbes)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang)
+
+* Sat Jul 31 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.7-0]
- kernel-5.13.6-0 (Justin M. Forbes)
- kernel-5.13.5-0 (Justin M. Forbes)
- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes)
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index 9f9fc2d..49adbfa 100644
--- a/patch-5.13-redhat.patch
+++ b/patch-5.13-redhat.patch
@@ -90,7 +90,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel
diff --git a/Makefile b/Makefile
-index 96967f895193..dccbf438edf2 100644
+index 614327400aea..15c6acda836e 100644
--- a/Makefile
+++ b/Makefile
@@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
@@ -1404,10 +1404,10 @@ index d94bd8d732e9..7775395bef6f 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/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index fb1c5ae0da39..b7cf30213ac2 100644
+index d963f25fc7ae..66455e2261d0 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
-@@ -2830,32 +2830,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
+@@ -2880,32 +2880,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
return 0;
}
@@ -1440,7 +1440,7 @@ index fb1c5ae0da39..b7cf30213ac2 100644
static void nvme_async_probe(void *data, async_cookie_t cookie)
{
struct nvme_dev *dev = data;
-@@ -2905,7 +2879,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -2955,7 +2929,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
quirks |= check_vendor_combination_bug(pdev);
diff --git a/sources b/sources
index f467518..6140432 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13.6.tar.xz) = 1e2cd327165a6fda5348c60b99beab684531e9843f6e3acdedd35471855fb2d8e1425bb9f57899b7b69be2697dc8936c46fc5d5719caaa7d46300effa675dc7c
-SHA512 (kernel-abi-whitelists-5.13.6-100.tar.bz2) = 8e4c87ac79008a65e65c2eec68fa4f40fe8583c8a99d767e01eb85fb2c6913d06389f78b51843a6a448fb6f726a1f4b85be68b1902a29ccc7bd26867cb6723ba
-SHA512 (kernel-kabi-dw-5.13.6-100.tar.bz2) = eba0499a6eefd5482cc5966455d617698b7f2103101ed596076f0f215e341cf0640d2dadf476cfbc436a8b8836dedc88493f890f6366cc31694d12d8a5bfe0bd
+SHA512 (linux-5.13.7.tar.xz) = 63e05770b3a9287c1e6f855c34e37c5ce50dfb42b42c500f647e4860e92bd89697ce571e57377b00dbf954e854259e3e9fd1dddfc4b0fb9eb88f5bd04fa9a487
+SHA512 (kernel-abi-whitelists-5.13.7-100.tar.bz2) = ae3b3de2b67bbd052bc226fa0ca65c33321027346bff87fbf830a59f244560e5697e77dad7eec5bb66b13a296869068e8303028f39f2d9f855d3e04950e53810
+SHA512 (kernel-kabi-dw-5.13.7-100.tar.bz2) = 796acd53da0cb495d9d7701d0cbb1edb6431a87d07e8fade2105babdaa74aa99111dc4f342fa19c14d07a1b8fc8b360aa5e07739a5c144387eebc63582d44300