From f2f0619cb0855448efb9ae303a63a96f3ce4aeaf Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 21 Nov 2025 13:09:21 -0500 Subject: [PATCH] Drop rdma-irdma-update-kconfig.patch Signed-off-by: Sasha Levin --- queue-5.15/rdma-irdma-update-kconfig.patch | 42 ---------------------- queue-5.15/series | 1 - queue-6.1/rdma-irdma-update-kconfig.patch | 42 ---------------------- queue-6.1/series | 1 - queue-6.6/rdma-irdma-update-kconfig.patch | 42 ---------------------- queue-6.6/series | 1 - 6 files changed, 129 deletions(-) delete mode 100644 queue-5.15/rdma-irdma-update-kconfig.patch delete mode 100644 queue-6.1/rdma-irdma-update-kconfig.patch delete mode 100644 queue-6.6/rdma-irdma-update-kconfig.patch diff --git a/queue-5.15/rdma-irdma-update-kconfig.patch b/queue-5.15/rdma-irdma-update-kconfig.patch deleted file mode 100644 index 42eeb7f402..0000000000 --- a/queue-5.15/rdma-irdma-update-kconfig.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6fbb7cd4c0d0ca34553b8ed7846e2c2ce5c427dc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 27 Aug 2025 10:25:45 -0500 -Subject: RDMA/irdma: Update Kconfig - -From: Tatyana Nikolova - -[ Upstream commit 060842fed53f77a73824c9147f51dc6746c1267a ] - -Update Kconfig to add dependency on idpf module and -add IPU E2000 to the list of supported devices. - -Signed-off-by: Tatyana Nikolova -Link: https://patch.msgid.link/20250827152545.2056-17-tatyana.e.nikolova@intel.com -Tested-by: Jacob Moroni -Signed-off-by: Leon Romanovsky -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/irdma/Kconfig | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/infiniband/hw/irdma/Kconfig b/drivers/infiniband/hw/irdma/Kconfig -index b6f9c41bca51d..41660203e0049 100644 ---- a/drivers/infiniband/hw/irdma/Kconfig -+++ b/drivers/infiniband/hw/irdma/Kconfig -@@ -4,9 +4,10 @@ config INFINIBAND_IRDMA - depends on INET - depends on IPV6 || !IPV6 - depends on PCI -- depends on ICE && I40E -+ depends on IDPF && ICE && I40E - select GENERIC_ALLOCATOR - select AUXILIARY_BUS - help -- This is an Intel(R) Ethernet Protocol Driver for RDMA driver -- that support E810 (iWARP/RoCE) and X722 (iWARP) network devices. -+ This is an Intel(R) Ethernet Protocol Driver for RDMA that -+ supports IPU E2000 (RoCEv2), E810 (iWARP/RoCEv2) and X722 (iWARP) -+ network devices. --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 821a0efb82..3da75ed3d8 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -161,7 +161,6 @@ allow-finish_no_open-file-err_ptr-e.patch usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch ipv6-np-rxpmtu-race-annotation.patch -rdma-irdma-update-kconfig.patch jfs-verify-inode-mode-when-loading-from-disk.patch jfs-fix-uninitialized-waitqueue-in-transaction-manag.patch net-ethernet-microchip-sparx5-make-it-selectable-for.patch diff --git a/queue-6.1/rdma-irdma-update-kconfig.patch b/queue-6.1/rdma-irdma-update-kconfig.patch deleted file mode 100644 index 03f080f7fb..0000000000 --- a/queue-6.1/rdma-irdma-update-kconfig.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9f66727edfb0d5a09a72a12e60969ed662f9e4c8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 27 Aug 2025 10:25:45 -0500 -Subject: RDMA/irdma: Update Kconfig - -From: Tatyana Nikolova - -[ Upstream commit 060842fed53f77a73824c9147f51dc6746c1267a ] - -Update Kconfig to add dependency on idpf module and -add IPU E2000 to the list of supported devices. - -Signed-off-by: Tatyana Nikolova -Link: https://patch.msgid.link/20250827152545.2056-17-tatyana.e.nikolova@intel.com -Tested-by: Jacob Moroni -Signed-off-by: Leon Romanovsky -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/irdma/Kconfig | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/infiniband/hw/irdma/Kconfig b/drivers/infiniband/hw/irdma/Kconfig -index b6f9c41bca51d..41660203e0049 100644 ---- a/drivers/infiniband/hw/irdma/Kconfig -+++ b/drivers/infiniband/hw/irdma/Kconfig -@@ -4,9 +4,10 @@ config INFINIBAND_IRDMA - depends on INET - depends on IPV6 || !IPV6 - depends on PCI -- depends on ICE && I40E -+ depends on IDPF && ICE && I40E - select GENERIC_ALLOCATOR - select AUXILIARY_BUS - help -- This is an Intel(R) Ethernet Protocol Driver for RDMA driver -- that support E810 (iWARP/RoCE) and X722 (iWARP) network devices. -+ This is an Intel(R) Ethernet Protocol Driver for RDMA that -+ supports IPU E2000 (RoCEv2), E810 (iWARP/RoCEv2) and X722 (iWARP) -+ network devices. --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index a5c6be8dc4..0000b03247 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -236,7 +236,6 @@ allow-finish_no_open-file-err_ptr-e.patch usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch ipv6-np-rxpmtu-race-annotation.patch -rdma-irdma-update-kconfig.patch jfs-verify-inode-mode-when-loading-from-disk.patch jfs-fix-uninitialized-waitqueue-in-transaction-manag.patch asoc-qcom-sc8280xp-explicitly-set-s16le-format-in-sc.patch diff --git a/queue-6.6/rdma-irdma-update-kconfig.patch b/queue-6.6/rdma-irdma-update-kconfig.patch deleted file mode 100644 index 54ee09d08d..0000000000 --- a/queue-6.6/rdma-irdma-update-kconfig.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 277e8b63f2eb8fbb6eaa41ca6b012b19577f7ef1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 27 Aug 2025 10:25:45 -0500 -Subject: RDMA/irdma: Update Kconfig - -From: Tatyana Nikolova - -[ Upstream commit 060842fed53f77a73824c9147f51dc6746c1267a ] - -Update Kconfig to add dependency on idpf module and -add IPU E2000 to the list of supported devices. - -Signed-off-by: Tatyana Nikolova -Link: https://patch.msgid.link/20250827152545.2056-17-tatyana.e.nikolova@intel.com -Tested-by: Jacob Moroni -Signed-off-by: Leon Romanovsky -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/irdma/Kconfig | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/infiniband/hw/irdma/Kconfig b/drivers/infiniband/hw/irdma/Kconfig -index b6f9c41bca51d..41660203e0049 100644 ---- a/drivers/infiniband/hw/irdma/Kconfig -+++ b/drivers/infiniband/hw/irdma/Kconfig -@@ -4,9 +4,10 @@ config INFINIBAND_IRDMA - depends on INET - depends on IPV6 || !IPV6 - depends on PCI -- depends on ICE && I40E -+ depends on IDPF && ICE && I40E - select GENERIC_ALLOCATOR - select AUXILIARY_BUS - help -- This is an Intel(R) Ethernet Protocol Driver for RDMA driver -- that support E810 (iWARP/RoCE) and X722 (iWARP) network devices. -+ This is an Intel(R) Ethernet Protocol Driver for RDMA that -+ supports IPU E2000 (RoCEv2), E810 (iWARP/RoCEv2) and X722 (iWARP) -+ network devices. --- -2.51.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 0d5403a2ec..f8f5b20ad2 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -248,7 +248,6 @@ usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch f2fs-fix-infinite-loop-in-__insert_extent_tree.patch ipv6-np-rxpmtu-race-annotation.patch -rdma-irdma-update-kconfig.patch jfs-verify-inode-mode-when-loading-from-disk.patch jfs-fix-uninitialized-waitqueue-in-transaction-manag.patch asoc-qcom-sc8280xp-explicitly-set-s16le-format-in-sc.patch -- 2.47.3