generic: 6.1: manually refresh backport patches

Refresh backport patches that still needs to be merged for kernel 6.1.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/generic/backport-6.1/424-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch b/target/linux/generic/backport-6.1/424-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch
index 2d89a5db1266ed853236182d5ac6ab54bb94b5e4..017a58ba63678809e129fc200dd36ecd631b7590 100644 (file)
--- a/target/linux/generic/backport-6.1/424-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch
+++ b/target/linux/generic/backport-6.1/424-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch
@@ -37,9 +37,9 @@ Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-4-michael@walle.cc
                                goto err;
                        }
 @@ -991,7 +990,7 @@ static int mtd_otp_nvmem_add(struct mtd_
+ 
  err:
-       if (mtd->otp_user_nvmem)
-               nvmem_unregister(mtd->otp_user_nvmem);
+       nvmem_unregister(mtd->otp_user_nvmem);
 -      return err;
 +      return dev_err_probe(dev, err, "Failed to register OTP NVMEM device\n");
  }

diff --git a/target/linux/generic/backport-6.1/707-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch b/target/linux/generic/backport-6.1/707-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch
index 9743a3f2062fb275d8b940af6086802d1b1696e4..6a82d191f90a90c62a63c4cc32f883efa3c476bb 100644 (file)
--- a/target/linux/generic/backport-6.1/707-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch
+++ b/target/linux/generic/backport-6.1/707-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch
@@ -64,9 +64,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 --- a/drivers/net/pcs/Makefile
 +++ b/drivers/net/pcs/Makefile
 @@ -5,3 +5,4 @@ pcs_xpcs-$(CONFIG_PCS_XPCS)    := pcs-xpcs.
- 
- obj-$(CONFIG_PCS_XPCS)                += pcs_xpcs.o
  obj-$(CONFIG_PCS_LYNX)                += pcs-lynx.o
+ obj-$(CONFIG_PCS_RZN1_MIIC)   += pcs-rzn1-miic.o
+ obj-$(CONFIG_PCS_ALTERA_TSE)  += pcs-altera-tse.o
 +obj-$(CONFIG_PCS_MTK_LYNXI)   += pcs-mtk-lynxi.o
 --- /dev/null
 +++ b/drivers/net/pcs/pcs-mtk-lynxi.c

diff --git a/target/linux/generic/backport-6.1/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch b/target/linux/generic/backport-6.1/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch
index b3412df9e0ccef315fac1e79c13816c0dee88fdb..132453738415dac8dc512c6c84c27987e1c017d4 100644 (file)
--- a/target/linux/generic/backport-6.1/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch
+++ b/target/linux/generic/backport-6.1/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch
@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (ring->buf) {
 -              for (i = 0; i < MTK_DMA_SIZE; i++)
 +              for (i = 0; i < ring->dma_size; i++)
-                       mtk_tx_unmap(eth, &ring->buf[i], false);
+                       mtk_tx_unmap(eth, &ring->buf[i], NULL, false);
                kfree(ring->buf);
                ring->buf = NULL;
 @@ -2247,14 +2253,14 @@ static void mtk_tx_clean(struct mtk_eth

diff --git a/target/linux/generic/backport-6.1/730-08-v6.3-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch b/target/linux/generic/backport-6.1/730-08-v6.3-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch
index 0478cb528e2d1cb44506467ce1ae0ea7e2c49416..5458279fff0a9d803653f0c201b6b21c592c5297 100644 (file)
--- a/target/linux/generic/backport-6.1/730-08-v6.3-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch
+++ b/target/linux/generic/backport-6.1/730-08-v6.3-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch
@@ -31,9 +31,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 --- a/net/dsa/dsa.c
 +++ b/net/dsa/dsa.c
 @@ -20,6 +20,7 @@
- #include <linux/phy_fixed.h>
+ #include <linux/netdevice.h>
+ #include <linux/sysfs.h>
  #include <linux/ptp_classify.h>
- #include <linux/etherdevice.h>
 +#include <net/dst_metadata.h>
  
  #include "dsa_priv.h"

diff --git a/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch b/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
index 6c205217018b525ba9cafc3e567b7f5aa1aef4f0..f15498c7119f28cc7003d948185f706b35a89435 100644 (file)
--- a/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
+++ b/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
@@ -137,8 +137,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (!compatible || strlen(compatible) > cplen)
                return -ENODEV;
        p = strchr(compatible, ',');
--      strlcpy(modalias, p ? p + 1 : compatible, len);
-+      strlcpy(alias, p ? p + 1 : compatible, len);
+-      strscpy(modalias, p ? p + 1 : compatible, len);
++      strscpy(alias, p ? p + 1 : compatible, len);
        return 0;
  }
 -EXPORT_SYMBOL_GPL(of_modalias_node);