drop net-mlx5-update-the-list-of-the-pci-supported-devices.patch from 4.19

diff --git a/queue-4.19/net-mlx5-update-the-list-of-the-pci-supported-devices.patch b/queue-4.19/net-mlx5-update-the-list-of-the-pci-supported-devices.patch
deleted file mode 100644 (file)
index 83e8b4c..0000000
--- a/queue-4.19/net-mlx5-update-the-list-of-the-pci-supported-devices.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7eca940322f47fd30dafb70da04d193a0154090 Mon Sep 17 00:00:00 2001
-From: Shani Shapp <shanish@mellanox.com>
-Date: Tue, 12 Nov 2019 15:10:00 +0200
-Subject: net/mlx5: Update the list of the PCI supported devices
-
-From: Shani Shapp <shanish@mellanox.com>
-
-commit b7eca940322f47fd30dafb70da04d193a0154090 upstream.
-
-Add the upcoming ConnectX-6 LX device ID.
-
-Fixes: 85327a9c4150 ("net/mlx5: Update the list of the PCI supported devices")
-Signed-off-by: Shani Shapp <shanish@mellanox.com>
-Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
-Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/mellanox/mlx5/core/main.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
-@@ -1644,6 +1644,7 @@ static const struct pci_device_id mlx5_c
-       { PCI_VDEVICE(MELLANOX, 0x101c), MLX5_PCI_DEV_IS_VF},   /* ConnectX-6 VF */
-       { PCI_VDEVICE(MELLANOX, 0x101d) },                      /* ConnectX-6 Dx */
-       { PCI_VDEVICE(MELLANOX, 0x101e), MLX5_PCI_DEV_IS_VF},   /* ConnectX Family mlx5Gen Virtual Function */
-+      { PCI_VDEVICE(MELLANOX, 0x101f) },                      /* ConnectX-6 LX */
-       { PCI_VDEVICE(MELLANOX, 0xa2d2) },                      /* BlueField integrated ConnectX-5 network controller */
-       { PCI_VDEVICE(MELLANOX, 0xa2d3), MLX5_PCI_DEV_IS_VF},   /* BlueField integrated ConnectX-5 network controller VF */
-       { PCI_VDEVICE(MELLANOX, 0xa2d6) },                      /* BlueField-2 integrated ConnectX-6 Dx network controller */

diff --git a/queue-4.19/series b/queue-4.19/series
index 5ebbbfc2145c444cb56db72d34dfa779ca2762a9..ed40b0862ce0d8e498d33e2800b245eef7ff5d50 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -288,6 +288,5 @@ usb-serial-option-add-telit-fn920c04-mbim-compositions.patch
 parport-proper-fix-for-array-out-of-bounds-access.patch
 x86-apic-always-explicitly-disarm-tsc-deadline-timer.patch
 nilfs2-propagate-directory-read-errors-from-nilfs_find_entry.patch
-net-mlx5-update-the-list-of-the-pci-supported-devices.patch
 clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch
 clk-fix-slab-out-of-bounds-error-in-devm_clk_release.patch