summaryrefslogtreecommitdiffstats
path: root/patch-5.13-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-31 08:55:34 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-31 08:55:34 -0500
commit0af328919107d8e0004387617bdd7eba17a86dd0 (patch)
treed650950bccd04af918cd774f0bfb49360c57b9b6 /patch-5.13-redhat.patch
parent15773b17d942e0f0319895e112291e9fee9c67b9 (diff)
downloadkernel-0af328919107d8e0004387617bdd7eba17a86dd0.tar.gz
kernel-0af328919107d8e0004387617bdd7eba17a86dd0.tar.xz
kernel-0af328919107d8e0004387617bdd7eba17a86dd0.zip
kernel-5.13.7-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) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.13-redhat.patch')
-rw-r--r--patch-5.13-redhat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index 9f9fc2d42..49adbfa8e 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);