[openwrt/openwrt] generic: 5.15: move mtk eth soc patch from pending to backport

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a1522ec156ff5b5aabe79c53450ff5d02598dd20

commit a1522ec156ff5b5aabe79c53450ff5d02598dd20
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Fri Oct 21 23:19:44 2022 +0200

    generic: 5.15: move mtk eth soc patch from pending to backport
    
    Move mtk eth soc patch from pending to backport as it got merged
    upstream.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 ...-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch} | 23 +++++--------------
 ...-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch} | 26 +++++-----------------
 2 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/target/linux/generic/pending-5.15/781-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch b/target/linux/generic/backport-5.15/788-v6.0-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch
similarity index 57%
rename from target/linux/generic/pending-5.15/781-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch
rename to target/linux/generic/backport-5.15/788-v6.0-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch
index 65845ea4c6..27c719b663 100644
--- a/target/linux/generic/pending-5.15/781-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch
+++ b/target/linux/generic/backport-5.15/788-v6.0-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch
@@ -1,23 +1,8 @@
-From 8743af8a77dd909970462ca578358128cce5d027 Mon Sep 17 00:00:00 2001
+From c9da02bfb1112461e048d3b736afb1873f6f4ccf Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel at makrotopia.org>
-Date: Tue, 27 Sep 2022 15:39:39 +0100
-Subject: [PATCH] net: ethernet: mtk_eth_soc: fix mask of
+Date: Tue, 27 Sep 2022 16:30:02 +0100
+Subject: [PATCH 1/1] net: ethernet: mtk_eth_soc: fix mask of
  RX_DMA_GET_SPORT{,_V2}
-To: linux-mediatek at lists.infradead.org,
-    netdev at vger.kernel.org,
-    Lorenzo Bianconi <lorenzo at kernel.org>
-Cc: Sujuan Chen <sujuan.chen at mediatek.com>,
-    Bo Jiao <Bo.Jiao at mediatek.com>,
-    Felix Fietkau <nbd at nbd.name>,
-    John Crispin <john at phrozen.org>,
-    Sean Wang <sean.wang at mediatek.com>,
-    Mark Lee <Mark-MC.Lee at mediatek.com>,
-    David S. Miller <davem at davemloft.net>,
-    Eric Dumazet <edumazet at google.com>,
-    Jakub Kicinski <kuba at kernel.org>,
-    Paolo Abeni <pabeni at redhat.com>,
-    Matthias Brugger <matthias.bgg at gmail.com>,
-    Chen Minqiang <ptpt52 at gmail.com>
 
 The bitmasks applied in RX_DMA_GET_SPORT and RX_DMA_GET_SPORT_V2 macros
 were swapped. Fix that.
@@ -26,6 +11,8 @@ Reported-by: Chen Minqiang <ptpt52 at gmail.com>
 Fixes: 160d3a9b192985 ("net: ethernet: mtk_eth_soc: introduce MTK_NETSYS_V2 support")
 Acked-by: Lorenzo Bianconi <lorenzo at kernel.org>
 Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Link: https://lore.kernel.org/r/YzMW+mg9UsaCdKRQ@makrotopia.org
+Signed-off-by: Jakub Kicinski <kuba at kernel.org>
 ---
  drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/linux/generic/pending-5.15/782-net-ethernet-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch b/target/linux/generic/backport-5.15/789-v6.1-net-ethernet-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch
similarity index 58%
rename from target/linux/generic/pending-5.15/782-net-ethernet-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch
rename to target/linux/generic/backport-5.15/789-v6.1-net-ethernet-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch
index cc71ec60f3..11465c1c5b 100644
--- a/target/linux/generic/pending-5.15/782-net-ethernet-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch
+++ b/target/linux/generic/backport-5.15/789-v6.1-net-ethernet-mtk_eth_soc-fix-state-in-__mtk_foe_entr.patch
@@ -1,24 +1,8 @@
-From cd8e1f340c3e571b78952d4ca2c128d183a47cc2 Mon Sep 17 00:00:00 2001
+From ae3ed15da5889263de372ff9df2e83e16acca4cb Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel at makrotopia.org>
-Date: Wed, 28 Sep 2022 02:17:02 +0100
-Subject: [PATCH] net: ethernet: mtk_eth_soc: fix state in
+Date: Fri, 30 Sep 2022 01:56:53 +0100
+Subject: [PATCH 1/1] net: ethernet: mtk_eth_soc: fix state in
  __mtk_foe_entry_clear
-To: linux-mediatek at lists.infradead.org,
-    netdev at vger.kernel.org,
-    Lorenzo Bianconi <lorenzo at kernel.org>
-Cc: Sujuan Chen <sujuan.chen at mediatek.com>,
-    Bo Jiao <Bo.Jiao at mediatek.com>,
-    Felix Fietkau <nbd at nbd.name>,
-    John Crispin <john at phrozen.org>,
-    Sean Wang <sean.wang at mediatek.com>,
-    Mark Lee <Mark-MC.Lee at mediatek.com>,
-    David S. Miller <davem at davemloft.net>,
-    Eric Dumazet <edumazet at google.com>,
-    Jakub Kicinski <kuba at kernel.org>,
-    Paolo Abeni <pabeni at redhat.com>,
-    Matthias Brugger <matthias.bgg at gmail.com>,
-    Chen Minqiang <ptpt52 at gmail.com>,
-    Thomas Hühn <thomas.huehn at hs-nordhausen.de>
 
 Setting ib1 state to MTK_FOE_STATE_UNBIND in __mtk_foe_entry_clear
 routine as done by commit 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc:
@@ -32,8 +16,10 @@ Tested on MT7622 (Linksys E8450) and MT7986 (BananaPi BPI-R3).
 
 Suggested-by: Felix Fietkau <nbd at nbd.name>
 Fixes: 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear")
-Fixes: 33fc42de33278 ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
+Fixes: 33fc42de33278b ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
 Signed-off-by: Daniel Golle <daniel at makrotopia.org>
+Link: https://lore.kernel.org/r/YzY+1Yg0FBXcnrtc@makrotopia.org
+Signed-off-by: Jakub Kicinski <kuba at kernel.org>
 ---
  drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)