diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-08-13 12:44:32 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-08-13 12:44:32 -0500 |
| commit | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (patch) | |
| tree | 499e2cc107f4bff8b98bd676b494d51ae89dcb4a /0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch | |
| parent | 142d1dbc8748e066ce794a391416b045d570be71 (diff) | |
| download | kernel-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-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch')
| -rw-r--r-- | 0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch index e110d0564..765d32e4d 100644 --- a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch +++ b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch @@ -44,10 +44,10 @@ Note: Simplified backport to just pci-ids 1 file changed, 6 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index e92fad99338c..8dae589e7e50 100644 +index 9b59f032a569..c27e39378aa9 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7766,6 +7766,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -7795,6 +7795,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -55,7 +55,7 @@ index e92fad99338c..8dae589e7e50 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -7778,13 +7779,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -7807,13 +7808,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, |