diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-12-11 07:22:05 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-12-11 07:22:05 -0600 |
| commit | 59ae253b39b596874a38a7f0ee63a613452e20a6 (patch) | |
| tree | 683f6eb7eb93614dd33ac3205949fd5784341ba9 /patch-5.16-redhat.patch | |
| parent | f6c4fe59538b8404ceaaa85e659db48c5b0fe7dd (diff) | |
| download | kernel-59ae253b39b596874a38a7f0ee63a613452e20a6.tar.gz kernel-59ae253b39b596874a38a7f0ee63a613452e20a6.tar.xz kernel-59ae253b39b596874a38a7f0ee63a613452e20a6.zip | |
kernel-5.16-0.rc4.20211210gitc741e49150db.32
* Fri Dec 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211210gitc741e49150db.32]
- redhat/configs: enable CONFIG_NTB_NETDEV for ark (John W. Linville)
- drivers/pci/pci-driver.c: Fix if/ifdef typo (Prarit Bhargava)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.16-redhat.patch')
| -rw-r--r-- | patch-5.16-redhat.patch | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index c52abf8e3..17a74b38e 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -1686,7 +1686,7 @@ index b334af8aa264..b2a0e2fc6d47 100644 { } diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index 588588cfda48..5218a8c10a93 100644 +index 588588cfda48..f0b7f4661f3a 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ @@ -1701,7 +1701,7 @@ index 588588cfda48..5218a8c10a93 100644 }; ATTRIBUTE_GROUPS(pci_drv); -+#if CONFIG_RHEL_DIFFERENCES ++#ifdef CONFIG_RHEL_DIFFERENCES +/** + * pci_hw_deprecated - Tell if a PCI device is deprecated + * @ids: array of PCI device id structures to search in @@ -3178,36 +3178,3 @@ index c88167a414b4..e65a178ff9f4 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -From f56e8c23f21528d48b494c2762b7d7674468273d Mon Sep 17 00:00:00 2001 -From: Prarit Bhargava <prarit@redhat.com> -Date: Wed, 8 Dec 2021 15:44:29 -0500 -Subject: [PATCH] drivers/pci/pci-driver.c: Fix if/ifdef typo - -This needs to be an ifdef, not an if. - -Fixes compile error: - -drivers/pci/pci-driver.c:299:5: warning: "CONFIG_RHEL_DIFFERENCES" is not defined, evaluates to 0 [-Wundef] - 299 | #if CONFIG_RHEL_DIFFERENCES - -Signed-off-by: Prarit Bhargava <prarit@redhat.com> ---- - drivers/pci/pci-driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index 5218a8c10a93..f0b7f4661f3a 100644 ---- a/drivers/pci/pci-driver.c -+++ b/drivers/pci/pci-driver.c -@@ -296,7 +296,7 @@ static struct attribute *pci_drv_attrs[] = { - }; - ATTRIBUTE_GROUPS(pci_drv); - --#if CONFIG_RHEL_DIFFERENCES -+#ifdef CONFIG_RHEL_DIFFERENCES - /** - * pci_hw_deprecated - Tell if a PCI device is deprecated - * @ids: array of PCI device id structures to search in --- -2.33.1 - |