]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
update header of queue-6.0/fpga-dfl-pci-add-ids-for-intel-n6000-n6001-and-c6100.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Oct 2022 16:48:21 +0000 (18:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Oct 2022 16:48:21 +0000 (18:48 +0200)
queue-6.0/fpga-dfl-pci-add-ids-for-intel-n6000-n6001-and-c6100.patch

index b9ef464aec3a0b53666cb0fcac54416e64d1d340..25fbeb244b8eb0b3068752b047c96dd44c9d8cc6 100644 (file)
@@ -18,17 +18,15 @@ Acked-by: Wu Hao <hao.wu@intel.com>
 Acked-by: Xu Yilun <yilun.xu@intel.com>
 Link: https://lore.kernel.org/r/20220719145644.242481-1-matthew.gerlach@linux.intel.com
 Signed-off-by: Xu Yilun <yilun.xu@intel.com>
-Stable-dep-of: 939bc5453b8c ("fpga: prevent integer overflow in dfl_feature_ioctl_set_irq()")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/fpga/dfl-pci.c | 18 ++++++++++++++++++
+ drivers/fpga/dfl-pci.c |   18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
-diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
-index fd1fa55c9113..0914e7328b1a 100644
 --- a/drivers/fpga/dfl-pci.c
 +++ b/drivers/fpga/dfl-pci.c
-@@ -77,12 +77,18 @@ static void cci_pci_free_irq(struct pci_dev *pcidev)
+@@ -77,12 +77,18 @@ static void cci_pci_free_irq(struct pci_
  #define PCIE_DEVICE_ID_INTEL_PAC_D5005                0x0B2B
  #define PCIE_DEVICE_ID_SILICOM_PAC_N5010      0x1000
  #define PCIE_DEVICE_ID_SILICOM_PAC_N5011      0x1001
@@ -47,7 +45,7 @@ index fd1fa55c9113..0914e7328b1a 100644
  
  static struct pci_device_id cci_pcie_id_tbl[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_PF_INT_5_X),},
-@@ -96,6 +102,18 @@ static struct pci_device_id cci_pcie_id_tbl[] = {
+@@ -96,6 +102,18 @@ static struct pci_device_id cci_pcie_id_
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_PAC_D5005_VF),},
        {PCI_DEVICE(PCI_VENDOR_ID_SILICOM_DENMARK, PCIE_DEVICE_ID_SILICOM_PAC_N5010),},
        {PCI_DEVICE(PCI_VENDOR_ID_SILICOM_DENMARK, PCIE_DEVICE_ID_SILICOM_PAC_N5011),},
@@ -66,6 +64,3 @@ index fd1fa55c9113..0914e7328b1a 100644
        {0,}
  };
  MODULE_DEVICE_TABLE(pci, cci_pcie_id_tbl);
--- 
-2.35.1
-