summaryrefslogtreecommitdiffstats
path: root/0001-add-pci_hw_vendor_status.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 12:44:32 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 12:44:32 -0500
commitf7a3bf654752fa0e92c7ab3e57e48d3415632852 (patch)
tree499e2cc107f4bff8b98bd676b494d51ae89dcb4a /0001-add-pci_hw_vendor_status.patch
parent142d1dbc8748e066ce794a391416b045d570be71 (diff)
downloadkernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.tar.gz
kernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.tar.xz
kernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.zip
kernel-5.9.0-0.rc0.20200813gitdc06fe51d26e.1
* Thu Aug 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc0.20200813gitdc06fe51d26e.1] - dc06fe51d26e rebase - More mismatches ("Justin M. Forbes") - Fedora config change due to deps ("Justin M. Forbes") - CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes") - Config change required for build part 2 ("Justin M. Forbes") - Config change required for build ("Justin M. Forbes") - Fedora config update ("Justin M. Forbes") - Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes) - redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava) - redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava) - Updated changelog for the release based on v5.8 (Fedora Kernel Team) - Add ability to sync upstream through Makefile (Don Zickus) - Add master merge check (Don Zickus) - Replace hardcoded values 'os-build' and project id with variables (Don Zickus) - gitattributes: Remove unnecesary export restrictions (Prarit Bhargava) - redhat/Makefile.common: Fix MARKER (Prarit Bhargava) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-add-pci_hw_vendor_status.patch')
-rw-r--r--0001-add-pci_hw_vendor_status.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch
index c64ca91f5..d27519548 100644
--- a/0001-add-pci_hw_vendor_status.patch
+++ b/0001-add-pci_hw_vendor_status.patch
@@ -30,10 +30,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 files changed, 33 insertions(+)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index da6510af1221..2ec02cbfda72 100644
+index 449466f71040..f5678ed743bf 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
#include <linux/kexec.h>
#include <linux/of_device.h>
#include <linux/acpi.h>
@@ -41,7 +41,7 @@ index da6510af1221..2ec02cbfda72 100644
#include "pci.h"
#include "pcie/portdrv.h"
-@@ -278,6 +279,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
+@@ -279,6 +280,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
return found_id;
}
@@ -77,7 +77,7 @@ index da6510af1221..2ec02cbfda72 100644
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 34c1c4f45288..6d9a405feea5 100644
+index 835530605c0d..1a5afb3b706f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1406,6 +1406,10 @@ int pci_add_dynid(struct pci_driver *drv,