From f1d239882ad1b82aed0e32a722a908e4648de80e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Mar 2022 17:13:55 +0100 Subject: [PATCH] drop bnx2-fix-an-error-message.patch from 5.10 and older --- queue-4.14/bnx2-fix-an-error-message.patch | 34 ---------------------- queue-4.14/series | 1 - queue-4.19/bnx2-fix-an-error-message.patch | 34 ---------------------- queue-4.19/series | 1 - queue-4.9/bnx2-fix-an-error-message.patch | 34 ---------------------- queue-4.9/series | 1 - queue-5.10/bnx2-fix-an-error-message.patch | 34 ---------------------- queue-5.10/series | 1 - queue-5.4/bnx2-fix-an-error-message.patch | 34 ---------------------- queue-5.4/series | 1 - 10 files changed, 175 deletions(-) delete mode 100644 queue-4.14/bnx2-fix-an-error-message.patch delete mode 100644 queue-4.19/bnx2-fix-an-error-message.patch delete mode 100644 queue-4.9/bnx2-fix-an-error-message.patch delete mode 100644 queue-5.10/bnx2-fix-an-error-message.patch delete mode 100644 queue-5.4/bnx2-fix-an-error-message.patch diff --git a/queue-4.14/bnx2-fix-an-error-message.patch b/queue-4.14/bnx2-fix-an-error-message.patch deleted file mode 100644 index 19c619ae69d..00000000000 --- a/queue-4.14/bnx2-fix-an-error-message.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f751c5cf3b30af6575e236bc21680c0ed9d2a9d6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 2 Mar 2022 21:21:15 +0100 -Subject: bnx2: Fix an error message - -From: Christophe JAILLET - -[ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ] - -Fix an error message and report the correct failing function. - -Signed-off-by: Christophe JAILLET -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/bnx2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c -index 299cefe6f94b..21e32d732c3f 100644 ---- a/drivers/net/ethernet/broadcom/bnx2.c -+++ b/drivers/net/ethernet/broadcom/bnx2.c -@@ -8234,7 +8234,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) - rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask); - if (rc) { - dev_err(&pdev->dev, -- "pci_set_consistent_dma_mask failed, aborting\n"); -+ "dma_set_coherent_mask failed, aborting\n"); - goto err_out_unmap; - } - } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { --- -2.34.1 - diff --git a/queue-4.14/series b/queue-4.14/series index c11f67ab9f2..1e87b540e88 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -10,5 +10,4 @@ atm-firestream-check-the-return-value-of-ioremap-in-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch tcp-make-tcp_read_sock-more-robust.patch sfc-extend-the-locking-on-mcdi-seqno.patch -bnx2-fix-an-error-message.patch kselftest-vm-fix-tests-build-with-old-libc.patch diff --git a/queue-4.19/bnx2-fix-an-error-message.patch b/queue-4.19/bnx2-fix-an-error-message.patch deleted file mode 100644 index 9ebff8a085e..00000000000 --- a/queue-4.19/bnx2-fix-an-error-message.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 383815afc411523e2f530662754e7208f316ac28 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 2 Mar 2022 21:21:15 +0100 -Subject: bnx2: Fix an error message - -From: Christophe JAILLET - -[ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ] - -Fix an error message and report the correct failing function. - -Signed-off-by: Christophe JAILLET -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/bnx2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c -index 9993f1162ac6..65acffc90010 100644 ---- a/drivers/net/ethernet/broadcom/bnx2.c -+++ b/drivers/net/ethernet/broadcom/bnx2.c -@@ -8235,7 +8235,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) - rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask); - if (rc) { - dev_err(&pdev->dev, -- "pci_set_consistent_dma_mask failed, aborting\n"); -+ "dma_set_coherent_mask failed, aborting\n"); - goto err_out_unmap; - } - } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { --- -2.34.1 - diff --git a/queue-4.19/series b/queue-4.19/series index a8f1b9964a3..e830078597f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -13,7 +13,6 @@ atm-firestream-check-the-return-value-of-ioremap-in-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch tcp-make-tcp_read_sock-more-robust.patch sfc-extend-the-locking-on-mcdi-seqno.patch -bnx2-fix-an-error-message.patch kselftest-vm-fix-tests-build-with-old-libc.patch sched-topology-make-sched_init_numa-use-a-set-for-the-deduplicating-sort.patch sched-topology-fix-sched_domain_topology_level-alloc-in-sched_init_numa.patch diff --git a/queue-4.9/bnx2-fix-an-error-message.patch b/queue-4.9/bnx2-fix-an-error-message.patch deleted file mode 100644 index 5b7dc199e46..00000000000 --- a/queue-4.9/bnx2-fix-an-error-message.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 21897ffc9d36e8bd988f31e946204ff4f537a1d2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 2 Mar 2022 21:21:15 +0100 -Subject: bnx2: Fix an error message - -From: Christophe JAILLET - -[ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ] - -Fix an error message and report the correct failing function. - -Signed-off-by: Christophe JAILLET -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/bnx2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c -index e15e487c14dd..94f8c2824649 100644 ---- a/drivers/net/ethernet/broadcom/bnx2.c -+++ b/drivers/net/ethernet/broadcom/bnx2.c -@@ -8238,7 +8238,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) - rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask); - if (rc) { - dev_err(&pdev->dev, -- "pci_set_consistent_dma_mask failed, aborting\n"); -+ "dma_set_coherent_mask failed, aborting\n"); - goto err_out_unmap; - } - } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { --- -2.34.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 1f31d1d8b55..970a6bfba4c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -7,5 +7,4 @@ atm-firestream-check-the-return-value-of-ioremap-in-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch tcp-make-tcp_read_sock-more-robust.patch sfc-extend-the-locking-on-mcdi-seqno.patch -bnx2-fix-an-error-message.patch kselftest-vm-fix-tests-build-with-old-libc.patch diff --git a/queue-5.10/bnx2-fix-an-error-message.patch b/queue-5.10/bnx2-fix-an-error-message.patch deleted file mode 100644 index 236d0aa1508..00000000000 --- a/queue-5.10/bnx2-fix-an-error-message.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a8646b16711b6fb891daae342b7ba51b290bedad Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 2 Mar 2022 21:21:15 +0100 -Subject: bnx2: Fix an error message - -From: Christophe JAILLET - -[ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ] - -Fix an error message and report the correct failing function. - -Signed-off-by: Christophe JAILLET -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/bnx2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c -index 633b10389653..93129d9a87f4 100644 ---- a/drivers/net/ethernet/broadcom/bnx2.c -+++ b/drivers/net/ethernet/broadcom/bnx2.c -@@ -8229,7 +8229,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) - rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask); - if (rc) { - dev_err(&pdev->dev, -- "pci_set_consistent_dma_mask failed, aborting\n"); -+ "dma_set_coherent_mask failed, aborting\n"); - goto err_out_unmap; - } - } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 6719449a255..af401e2e090 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -17,7 +17,6 @@ drm-vrr-set-vrr-capable-prop-only-if-it-is-attached-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch tcp-make-tcp_read_sock-more-robust.patch sfc-extend-the-locking-on-mcdi-seqno.patch -bnx2-fix-an-error-message.patch kselftest-vm-fix-tests-build-with-old-libc.patch io_uring-return-back-safer-resurrect.patch arm64-kvm-fix-copy-and-paste-error-in-bhb-templates-for-v5.10-stable.patch diff --git a/queue-5.4/bnx2-fix-an-error-message.patch b/queue-5.4/bnx2-fix-an-error-message.patch deleted file mode 100644 index 03b2f13270e..00000000000 --- a/queue-5.4/bnx2-fix-an-error-message.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f6ad67326daf201c342c2df9026c46ee8621cb1e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 2 Mar 2022 21:21:15 +0100 -Subject: bnx2: Fix an error message - -From: Christophe JAILLET - -[ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ] - -Fix an error message and report the correct failing function. - -Signed-off-by: Christophe JAILLET -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/broadcom/bnx2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c -index c3f67d8e1093..f53292eab9da 100644 ---- a/drivers/net/ethernet/broadcom/bnx2.c -+++ b/drivers/net/ethernet/broadcom/bnx2.c -@@ -8231,7 +8231,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) - rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask); - if (rc) { - dev_err(&pdev->dev, -- "pci_set_consistent_dma_mask failed, aborting\n"); -+ "dma_set_coherent_mask failed, aborting\n"); - goto err_out_unmap; - } - } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { --- -2.34.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 7490e4d3aac..c869396f8c9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -39,5 +39,4 @@ drm-vrr-set-vrr-capable-prop-only-if-it-is-attached-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch tcp-make-tcp_read_sock-more-robust.patch sfc-extend-the-locking-on-mcdi-seqno.patch -bnx2-fix-an-error-message.patch kselftest-vm-fix-tests-build-with-old-libc.patch -- 2.47.3