forked from rpms/kernel
f7a3bf6547
* 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>
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Don Brace <dbrace@redhat.com>
|
|
Date: Mon, 16 Jul 2018 19:20:41 -0400
|
|
Subject: [PATCH] scsi: smartpqi: add inspur advantech ids
|
|
|
|
Message-id: <1531768843-2544-4-git-send-email-dbrace@redhat.com>
|
|
Patchwork-id: 224988
|
|
O-Subject: [RHEL 8.0 e-stor V2 PATCH 3/5] scsi: smartpqi: add inspur advantech ids
|
|
Bugzilla: 1503736
|
|
RH-Acked-by: Ewan Milne <emilne@redhat.com>
|
|
RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
|
|
|
|
From: Kevin Barnett <kevin.barnett@microsemi.com>
|
|
|
|
Add support for these new device IDs:
|
|
|
|
Advantech MIC-8312BridgeB
|
|
INSPUR PM8204-2GB
|
|
INSPUR PM8204-4GB
|
|
INSPUR PM8222-SHBA
|
|
|
|
Upstream Status: RHEL only
|
|
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
|
|
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
|
|
Signed-off-by: Don Brace <don.brace@microsemi.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
(cherry picked from commit 9f8d05fa98442de78d1ab30235b0cc656ed7aff0)
|
|
Signed-off-by: Don Brace <dbrace@redhat.com>
|
|
Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
|
|
---
|
|
drivers/scsi/smartpqi/smartpqi_init.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
|
|
index bd38c8cea56e..477eb841d4e5 100644
|
|
--- a/drivers/scsi/smartpqi/smartpqi_init.c
|
|
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
|
|
@@ -8251,6 +8251,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
|
|
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
0x19e5, 0xd22c)
|
|
},
|
|
+ {
|
|
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
+ 0x1bd4, 0x004a)
|
|
+ },
|
|
+ {
|
|
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
+ 0x1bd4, 0x004b)
|
|
+ },
|
|
+ {
|
|
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
+ 0x1bd4, 0x004c)
|
|
+ },
|
|
{
|
|
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
PCI_VENDOR_ID_ADAPTEC2, 0x0110)
|
|
@@ -8387,6 +8399,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
|
|
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
PCI_VENDOR_ID_ADVANTECH, 0x8312)
|
|
},
|
|
+ {
|
|
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
+ PCI_VENDOR_ID_ADVANTECH, 0x8312)
|
|
+ },
|
|
{
|
|
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
|
|
PCI_VENDOR_ID_DELL, 0x1fe0)
|
|
--
|
|
2.26.2
|
|
|