kernel: bump 6.1 to 6.1.93

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.93

Removed upstreamed:
bcm27xx/patches-6.1/950-0081-smsx95xx-fix-crimes-against-truesize.patch
reference: https://github.com/gregkh/linux/commit/517e64bcc9634bb46f8fc6421e272b8da3d7d953

Manually rebased:
bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch

All other patches automatically rebased.

Build system: bcm53xx ath79

Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com>

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 026ef91a52e13dafbed4c0b381cfbf5121dbc82c..c51ab3177c52982501634bf593b8b0775a350def 100644 (file)
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .92
-LINUX_KERNEL_HASH-6.1.92 = 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9
+LINUX_VERSION-6.1 = .93
+LINUX_KERNEL_HASH-6.1.93 = df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf

diff --git a/target/linux/bcm27xx/patches-6.1/950-0081-smsx95xx-fix-crimes-against-truesize.patch b/target/linux/bcm27xx/patches-6.1/950-0081-smsx95xx-fix-crimes-against-truesize.patch
deleted file mode 100644 (file)
index 98a6ed8..0000000
--- a/target/linux/bcm27xx/patches-6.1/950-0081-smsx95xx-fix-crimes-against-truesize.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 648c906a27d3713f589717f4be36583fc64f2ba1 Mon Sep 17 00:00:00 2001
-From: Steve Glendinning <steve.glendinning@smsc.com>
-Date: Thu, 19 Feb 2015 18:47:12 +0000
-Subject: [PATCH] smsx95xx: fix crimes against truesize
-
-smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings.
-
-This patch stops smsc95xx from changing truesize.
-
-Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
----
- drivers/net/usb/smsc95xx.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/drivers/net/usb/smsc95xx.c
-+++ b/drivers/net/usb/smsc95xx.c
-@@ -79,6 +79,10 @@ static bool turbo_mode = true;
- module_param(turbo_mode, bool, 0644);
- MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
- 
-+static bool truesize_mode = false;
-+module_param(truesize_mode, bool, 0644);
-+MODULE_PARM_DESC(truesize_mode, "Report larger truesize value");
-+
- static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
-                                         u32 *data)
- {
-@@ -1870,7 +1874,8 @@ static int smsc95xx_rx_fixup(struct usbn
-                               if (dev->net->features & NETIF_F_RXCSUM)
-                                       smsc95xx_rx_csum_offload(skb);
-                               skb_trim(skb, skb->len - 4); /* remove fcs */
--                              skb->truesize = size + sizeof(struct sk_buff);
-+                              if (truesize_mode)
-+                                      skb->truesize = size + sizeof(struct sk_buff);
- 
-                               return 1;
-                       }
-@@ -1888,7 +1893,8 @@ static int smsc95xx_rx_fixup(struct usbn
-                       if (dev->net->features & NETIF_F_RXCSUM)
-                               smsc95xx_rx_csum_offload(ax_skb);
-                       skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
--                      ax_skb->truesize = size + sizeof(struct sk_buff);
-+                      if (truesize_mode)
-+                              ax_skb->truesize = size + sizeof(struct sk_buff);
- 
-                       usbnet_skb_return(dev, ax_skb);
-               }

diff --git a/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
index c55f194b23abc133f11fef10cc5d76c70d99ea09..593e5eb456c73c2217761bbbd1b426a20754532c 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
@@ -11,9 +11,9 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
 
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -83,6 +83,10 @@ static bool truesize_mode = false;
- module_param(truesize_mode, bool, 0644);
- MODULE_PARM_DESC(truesize_mode, "Report larger truesize value");
+@@ -79,6 +79,10 @@ static bool turbo_mode = true;
+ module_param(turbo_mode, bool, 0644);
+ MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
  
 +static int packetsize = 2560;
 +module_param(packetsize, int, 0644);
@@ -22,7 +22,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
  static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
                                          u32 *data)
  {
-@@ -936,13 +940,13 @@ static int smsc95xx_reset(struct usbnet
+@@ -932,13 +936,13 @@ static int smsc95xx_reset(struct usbnet
  
        if (!turbo_mode) {
                burst_cap = 0;

diff --git a/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch
index a47a858e1669f39dd92e7c06376a91406da932f0..d9035fddbf1f727f019d6503b808b199dc40f894 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -22,7 +22,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -87,6 +87,10 @@ static int packetsize = 2560;
+@@ -83,6 +83,10 @@ static int packetsize = 2560;
  module_param(packetsize, int, 0644);
  MODULE_PARM_DESC(packetsize, "Override the RX URB packet size");
  
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
                                          u32 *data)
  {
-@@ -809,6 +813,52 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -805,6 +809,52 @@ static int smsc95xx_ioctl(struct net_dev
        return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
@@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static void smsc95xx_init_mac_address(struct usbnet *dev)
  {
        u8 addr[ETH_ALEN];
-@@ -832,6 +882,10 @@ static void smsc95xx_init_mac_address(st
+@@ -828,6 +878,10 @@ static void smsc95xx_init_mac_address(st
                }
        }
  

diff --git a/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch b/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch
index 3b847b561d81b869d7559a767fc2600db574c9fc..3b32562b491b60746219fc5ff62c865991459653 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch
@@ -27,7 +27,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -32,6 +32,8 @@ struct rpi_firmware {
+@@ -33,6 +33,8 @@ struct rpi_firmware {
        struct kref consumers;
  };
  
@@ -36,7 +36,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  static DEFINE_MUTEX(transaction_lock);
  
  static void response_callback(struct mbox_client *cl, void *msg)
-@@ -280,6 +282,7 @@ static int rpi_firmware_probe(struct pla
+@@ -281,6 +283,7 @@ static int rpi_firmware_probe(struct pla
        kref_init(&fw->consumers);
  
        platform_set_drvdata(pdev, fw);
@@ -44,7 +44,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  
        rpi_firmware_print_firmware_revision(fw);
        rpi_register_hwmon_driver(dev, fw);
-@@ -308,6 +311,7 @@ static int rpi_firmware_remove(struct pl
+@@ -309,6 +312,7 @@ static int rpi_firmware_remove(struct pl
        rpi_clk = NULL;
  
        rpi_firmware_put(fw);
@@ -52,7 +52,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  
        return 0;
  }
-@@ -382,7 +386,18 @@ static struct platform_driver rpi_firmwa
+@@ -383,7 +387,18 @@ static struct platform_driver rpi_firmwa
        .shutdown       = rpi_firmware_shutdown,
        .remove         = rpi_firmware_remove,
  };

diff --git a/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
index 90408f4916859561d613bc2c64997b10247d67bd..8a9a2da728c3ef3d7a7309fc15fb08e29f8aacf0 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
@@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -12,6 +12,7 @@
+@@ -13,6 +13,7 @@
  #include <linux/module.h>
  #include <linux/of_platform.h>
  #include <linux/platform_device.h>
@@ -21,7 +21,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  #include <linux/slab.h>
  #include <soc/bcm2835/raspberrypi-firmware.h>
  
-@@ -179,6 +180,26 @@ int rpi_firmware_property(struct rpi_fir
+@@ -180,6 +181,26 @@ int rpi_firmware_property(struct rpi_fir
  }
  EXPORT_SYMBOL_GPL(rpi_firmware_property);
  
@@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static void
  rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
  {
-@@ -387,15 +408,32 @@ static struct platform_driver rpi_firmwa
+@@ -388,15 +409,32 @@ static struct platform_driver rpi_firmwa
        .remove         = rpi_firmware_remove,
  };
  

diff --git a/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch b/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
index 1f62f7f54e6faba64a881d45178f1e6738864845..2b5a9fc3f80c75d611fd0b08e416045e3888a886 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
@@ -16,7 +16,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -31,6 +31,7 @@ struct rpi_firmware {
+@@ -32,6 +32,7 @@ struct rpi_firmware {
        u32 enabled;
  
        struct kref consumers;
@@ -24,7 +24,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  };
  
  static struct platform_device *g_pdev;
-@@ -176,6 +177,12 @@ int rpi_firmware_property(struct rpi_fir
+@@ -177,6 +178,12 @@ int rpi_firmware_property(struct rpi_fir
  
        kfree(data);
  
@@ -37,7 +37,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
        return ret;
  }
  EXPORT_SYMBOL_GPL(rpi_firmware_property);
-@@ -200,6 +207,27 @@ static int rpi_firmware_notify_reboot(st
+@@ -201,6 +208,27 @@ static int rpi_firmware_notify_reboot(st
        return 0;
  }
  
@@ -65,7 +65,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  static void
  rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
  {
-@@ -229,6 +257,11 @@ rpi_register_hwmon_driver(struct device
+@@ -230,6 +258,11 @@ rpi_register_hwmon_driver(struct device
  
        rpi_hwmon = platform_device_register_data(dev, "raspberrypi-hwmon",
                                                  -1, NULL, 0);

diff --git a/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch b/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
index 7a4b26ebda1ea95a3f774c8ce29aa65e63953208..742ae42164e6ad8b733bab77aeb145e00df7c26c 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
@@ -26,7 +26,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -233,6 +233,15 @@ rpi_firmware_print_firmware_revision(str
+@@ -234,6 +234,15 @@ rpi_firmware_print_firmware_revision(str
  {
        time64_t date_and_time;
        u32 packet;
@@ -42,7 +42,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        int ret = rpi_firmware_property(fw,
                                        RPI_FIRMWARE_GET_FIRMWARE_REVISION,
                                        &packet, sizeof(packet));
-@@ -242,7 +251,35 @@ rpi_firmware_print_firmware_revision(str
+@@ -243,7 +252,35 @@ rpi_firmware_print_firmware_revision(str
  
        /* This is not compatible with y2038 */
        date_and_time = packet;
@@ -79,7 +79,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  }
  
  static void
-@@ -339,6 +376,7 @@ static int rpi_firmware_probe(struct pla
+@@ -340,6 +377,7 @@ static int rpi_firmware_probe(struct pla
        g_pdev = pdev;
  
        rpi_firmware_print_firmware_revision(fw);

diff --git a/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch b/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch
index 43781f1256fbb7b84c470e763be3f9c2846a743b..d07fdf05d062c84d436be1b69ed584cf66b9b40f 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch
@@ -36,7 +36,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
  MODULE_DESCRIPTION("BCM2835 clock driver");
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -499,7 +499,7 @@ out2:
+@@ -500,7 +500,7 @@ out2:
  out1:
        return ret;
  }

diff --git a/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
index 2a3e2d781e07c3ae2b3613e5e85f6581cfd9231f..19573eda1b3fd126e7cb333884c93bb465b9f241 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
@@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3690,6 +3690,7 @@ static int spi_set_cs_timing(struct spi_
+@@ -3694,6 +3694,7 @@ static int spi_set_cs_timing(struct spi_
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        unsigned        bad_bits, ugly_bits;
        int             status = 0;
  
-@@ -3710,6 +3711,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3714,6 +3715,14 @@ int spi_setup(struct spi_device *spi)
                (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
                 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
                return -EINVAL;

diff --git a/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch b/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
index 42cb682e0bed628e6b16d4300c9e5e1e91d118df..795e6bd909b40ff1f72a8b2bc4c082e45886362a 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
@@ -19,7 +19,7 @@ mechanism to be implemented for OS upgrades.
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -193,6 +193,7 @@ static int rpi_firmware_notify_reboot(st
+@@ -194,6 +194,7 @@ static int rpi_firmware_notify_reboot(st
  {
        struct rpi_firmware *fw;
        struct platform_device *pdev = g_pdev;
@@ -27,7 +27,7 @@ mechanism to be implemented for OS upgrades.
  
        if (!pdev)
                return 0;
-@@ -201,8 +202,28 @@ static int rpi_firmware_notify_reboot(st
+@@ -202,8 +203,28 @@ static int rpi_firmware_notify_reboot(st
        if (!fw)
                return 0;
  

diff --git a/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
index d0eecb7ee875ac2ad53eec77cf85d49b7bf97985..fa6aaa3d19b6d716dc7ca6eb892dc02780905c03 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3193,6 +3193,31 @@ static const struct panel_desc qishenglo
+@@ -3196,6 +3196,31 @@ static const struct panel_desc qishenglo
        .connector_type = DRM_MODE_CONNECTOR_DPI,
  };
  
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  static const struct display_timing rocktech_rk070er9427_timing = {
        .pixelclock = { 26400000, 33300000, 46800000 },
        .hactive = { 800, 800, 800 },
-@@ -4226,6 +4251,9 @@ static const struct of_device_id platfor
+@@ -4229,6 +4254,9 @@ static const struct of_device_id platfor
                .compatible = "qishenglong,gopher2b-lcd",
                .data = &qishenglong_gopher2b_lcd,
        }, {

diff --git a/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
index fa850a4fd9aee31c20be651b9df2bd199d8e7b77..904df714dc020c134cd0697c5fc525dc8ee7023b 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
        .clock = 9000,
        .hdisplay = 480,
-@@ -4110,6 +4136,9 @@ static const struct of_device_id platfor
+@@ -4113,6 +4139,9 @@ static const struct of_device_id platfor
                .compatible = "friendlyarm,hd702e",
                .data = &friendlyarm_hd702e,
        }, {

diff --git a/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch b/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch
index 9feea59a373c114acc7b51b202ed929189e78734..742b9d28581efbe52590af59f8d5f26f545265c2 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch
@@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -429,6 +429,18 @@ static int rpi_firmware_remove(struct pl
+@@ -430,6 +430,18 @@ static int rpi_firmware_remove(struct pl
        return 0;
  }
  
@@ -38,7 +38,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  /**
   * rpi_firmware_get - Get pointer to rpi_firmware structure.
   * @firmware_node:    Pointer to the firmware Device Tree node.
-@@ -484,12 +496,6 @@ struct rpi_firmware *devm_rpi_firmware_g
+@@ -485,12 +497,6 @@ struct rpi_firmware *devm_rpi_firmware_g
  }
  EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);
  

diff --git a/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch b/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch
index da30d57810a6310593db45d98f62618ddc24462a..d5ac2e941fee9b3d87c6a1c7563225f90336c6e2 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch
@@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -342,6 +342,26 @@ static void rpi_register_clk_driver(stru
+@@ -343,6 +343,26 @@ static void rpi_register_clk_driver(stru
                                                -1, NULL, 0);
  }
  

diff --git a/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch b/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch
index 2dac12b8a2b69cd4e39af4994ed2c1b5fb21d6a5..be8676e2f2ed0cc4e9d7fc2c4fc9906580e8ba1c 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch
@@ -36,7 +36,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  #include <sound/dmaengine_pcm.h>
  #include <sound/hdmi-codec.h>
  #include <sound/pcm_drm_eld.h>
-@@ -3695,7 +3696,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -3697,7 +3698,7 @@ static int vc4_hdmi_bind(struct device *
  
        if (variant->max_pixel_clock == 600000000) {
                struct vc4_dev *vc4 = to_vc4_dev(drm);

diff --git a/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch b/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch
index 4b77fe35162f7d36863440d35e6e0d5c11d04819..d8522d4ffa0a12062bad9021d2c928252f146aba 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch
@@ -91,7 +91,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                return MODE_CLOCK_HIGH;
  
        if (info->max_tmds_clock && clock > (info->max_tmds_clock * 1000))
-@@ -3694,14 +3695,6 @@ static int vc4_hdmi_bind(struct device *
+@@ -3696,14 +3697,6 @@ static int vc4_hdmi_bind(struct device *
        vc4_hdmi->disable_wifi_frequencies =
                of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence");
  

diff --git a/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch b/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
index 93da3ce94d3bcca6ead7902d1680588bc9560678..9abd05b5e27b22f464eca8347699ff83823312c5 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
@@ -165,7 +165,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static const struct drm_display_mode innolux_at070tn92_mode = {
        .clock = 33333,
        .hdisplay = 800,
-@@ -4146,6 +4178,9 @@ static const struct of_device_id platfor
+@@ -4149,6 +4181,9 @@ static const struct of_device_id platfor
                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {

diff --git a/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch
index 2c83a8083b9311c0e459accaca4c49b616008e5d..04967b529483ec2bfaab2ac11218ff9614b20928 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch
@@ -8,8 +8,8 @@ Slave addresses for DMA are meant to be supplied as physical addresses
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -22,7 +22,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        int index, len;
        int ret;
  
-@@ -2755,20 +2755,15 @@ static int vc4_hdmi_audio_init(struct vc
+@@ -2755,22 +2755,15 @@ static int vc4_hdmi_audio_init(struct vc
        }
  
        /*
@@ -40,6 +40,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 +      iomem = platform_get_resource(vc4_hdmi->pdev, IORESOURCE_MEM, index);
  
 -      addr = of_get_address(dev->of_node, index, NULL, NULL);
+-      if (!addr)
+-              return -EINVAL;
 -
 -      vc4_hdmi->audio.dma_data.addr = be32_to_cpup(addr) + mai_data->offset;
 +      vc4_hdmi->audio.dma_data.addr = iomem->start + mai_data->offset;

diff --git a/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 9265e931facce89dc951eb1c099be8be6a15354f..7dc9ee9af7c7b2d22955a78824093e95937b691d 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -43,7 +43,7 @@ Signed-off-by: Lukas Wunner <lukas@wunner.de>
 
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -814,49 +814,18 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -810,49 +810,18 @@ static int smsc95xx_ioctl(struct net_dev
  }
  
  /* Check the macaddr module parameter for a MAC address */
@@ -103,7 +103,7 @@ Signed-off-by: Lukas Wunner <lukas@wunner.de>
  }
  
  static void smsc95xx_init_mac_address(struct usbnet *dev)
-@@ -883,8 +852,12 @@ static void smsc95xx_init_mac_address(st
+@@ -879,8 +848,12 @@ static void smsc95xx_init_mac_address(st
        }
  
        /* Check module parameters */

diff --git a/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch b/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
index ef70de7ee4689cf8c7fbef0d437a6e00f42a9ebf..42f4266682cb81257d5eb6232da87f51aefc78b9 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3241,11 +3241,11 @@ static const struct panel_desc qishenglo
+@@ -3244,11 +3244,11 @@ static const struct panel_desc qishenglo
  };
  
  static const struct drm_display_mode raspberrypi_7inch_mode = {

diff --git a/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch b/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
index 9122d7347607d715362c0762aba71de50a56f72b..a46d6d3f15fb2ff21f3663333e9528ac180fcc60 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
@@ -23,7 +23,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
  
  /**
   * struct panel_desc - Describes a simple panel.
-@@ -4662,6 +4663,9 @@ static const struct panel_desc_dsi osd10
+@@ -4665,6 +4666,9 @@ static const struct panel_desc_dsi osd10
        .lanes = 4,
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
  static const struct of_device_id dsi_of_match[] = {
        {
                .compatible = "auo,b080uan01",
-@@ -4685,14 +4689,118 @@ static const struct of_device_id dsi_of_
+@@ -4688,14 +4692,118 @@ static const struct of_device_id dsi_of_
                .compatible = "osddisplays,osd101t2045-53ts",
                .data = &osd101t2045_53ts
        }, {
@@ -152,7 +152,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
        const struct of_device_id *id;
        int err;
  
-@@ -4700,7 +4808,20 @@ static int panel_simple_dsi_probe(struct
+@@ -4703,7 +4811,20 @@ static int panel_simple_dsi_probe(struct
        if (!id)
                return -ENODEV;
  

diff --git a/target/linux/generic/backport-6.1/426-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch b/target/linux/generic/backport-6.1/426-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch
index 9ddda420ac3bbfa271db88c62ebb61083dfa1b43..28f54d9e5e5abf0aa815c2a91fff4b9b53b9692b 100644 (file)
--- a/target/linux/generic/backport-6.1/426-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch
+++ b/target/linux/generic/backport-6.1/426-v6.4-0004-mtd-core-prepare-mtd_otp_nvmem_add-to-handle-EPROBE_.patch
@@ -17,7 +17,7 @@ Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-4-michael@walle.cc
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -953,8 +953,8 @@ static int mtd_otp_nvmem_add(struct mtd_
+@@ -955,8 +955,8 @@ static int mtd_otp_nvmem_add(struct mtd_
                        nvmem = mtd_otp_nvmem_register(mtd, "user-otp", size,
                                                       mtd_nvmem_user_otp_reg_read);
                        if (IS_ERR(nvmem)) {
@@ -28,7 +28,7 @@ Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-4-michael@walle.cc
                        }
                        mtd->otp_user_nvmem = nvmem;
                }
-@@ -971,7 +971,6 @@ static int mtd_otp_nvmem_add(struct mtd_
+@@ -973,7 +973,6 @@ static int mtd_otp_nvmem_add(struct mtd_
                        nvmem = mtd_otp_nvmem_register(mtd, "factory-otp", size,
                                                       mtd_nvmem_fact_otp_reg_read);
                        if (IS_ERR(nvmem)) {
@@ -36,7 +36,7 @@ Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-4-michael@walle.cc
                                err = PTR_ERR(nvmem);
                                goto err;
                        }
-@@ -983,7 +982,7 @@ static int mtd_otp_nvmem_add(struct mtd_
+@@ -985,7 +984,7 @@ static int mtd_otp_nvmem_add(struct mtd_
  
  err:
        nvmem_unregister(mtd->otp_user_nvmem);

diff --git a/target/linux/generic/backport-6.1/797-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch b/target/linux/generic/backport-6.1/797-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch
index 40e857de04e81e5e41365916dd777253d83908db..36083bbaf53f0e2802944c22d255738056a3f557 100644 (file)
--- a/target/linux/generic/backport-6.1/797-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch
+++ b/target/linux/generic/backport-6.1/797-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch
@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int mv88e6352_get_port4_serdes_cmode(struct mv88e6xxx_chip *chip)
  {
        u16 reg, val;
-@@ -4489,7 +4501,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -4501,7 +4513,7 @@ static const struct mv88e6xxx_ops mv88e6
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .stu_getnext = mv88e6352_g1_stu_getnext,
        .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
@@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mv88e6xxx_ops mv88e6172_ops = {
-@@ -4590,7 +4602,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -4604,7 +4616,7 @@ static const struct mv88e6xxx_ops mv88e6
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .stu_getnext = mv88e6352_g1_stu_getnext,
        .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mv88e6xxx_ops mv88e6176_ops = {
-@@ -5247,7 +5259,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -5281,7 +5293,7 @@ static const struct mv88e6xxx_ops mv88e6
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .stu_getnext = mv88e6352_g1_stu_getnext,
        .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mv88e6xxx_ops mv88e6351_ops = {
-@@ -5293,7 +5305,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -5327,7 +5339,7 @@ static const struct mv88e6xxx_ops mv88e6
        .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
        .avb_ops = &mv88e6352_avb_ops,
        .ptp_ops = &mv88e6352_ptp_ops,

diff --git a/target/linux/generic/backport-6.1/807-v6.5-04-net-dsa-mv88e6xxx-fix-88E6393X-family-internal-phys-.patch b/target/linux/generic/backport-6.1/807-v6.5-04-net-dsa-mv88e6xxx-fix-88E6393X-family-internal-phys-.patch
index b50cb0845483c77d2e6353ba4270383b3cf504b9..cadc70fd73b2e93116eb8f279285f26b62030f82 100644 (file)
--- a/target/linux/generic/backport-6.1/807-v6.5-04-net-dsa-mv88e6xxx-fix-88E6393X-family-internal-phys-.patch
+++ b/target/linux/generic/backport-6.1/807-v6.5-04-net-dsa-mv88e6xxx-fix-88E6393X-family-internal-phys-.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5956,7 +5956,8 @@ static const struct mv88e6xxx_info mv88e
+@@ -5998,7 +5998,8 @@ static const struct mv88e6xxx_info mv88e
                .name = "Marvell 88E6191X",
                .num_databases = 4096,
                .num_ports = 11,        /* 10 + Z80 */
@@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .max_vid = 8191,
                .max_sid = 63,
                .port_base_addr = 0x0,
-@@ -5979,7 +5980,8 @@ static const struct mv88e6xxx_info mv88e
+@@ -6021,7 +6022,8 @@ static const struct mv88e6xxx_info mv88e
                .name = "Marvell 88E6193X",
                .num_databases = 4096,
                .num_ports = 11,        /* 10 + Z80 */
@@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                .max_vid = 8191,
                .max_sid = 63,
                .port_base_addr = 0x0,
-@@ -6298,7 +6300,8 @@ static const struct mv88e6xxx_info mv88e
+@@ -6340,7 +6342,8 @@ static const struct mv88e6xxx_info mv88e
                .name = "Marvell 88E6393X",
                .num_databases = 4096,
                .num_ports = 11,        /* 10 + Z80 */

diff --git a/target/linux/generic/backport-6.1/807-v6.5-05-net-dsa-mv88e6xxx-pass-mv88e6xxx_chip-structure-to-p.patch b/target/linux/generic/backport-6.1/807-v6.5-05-net-dsa-mv88e6xxx-pass-mv88e6xxx_chip-structure-to-p.patch
index d027bd3a8bbe7ee80df6602879b9630c481eb608..e2d3b57cccc1d983adce31df2d1a05719ffa0108 100644 (file)
--- a/target/linux/generic/backport-6.1/807-v6.5-05-net-dsa-mv88e6xxx-pass-mv88e6xxx_chip-structure-to-p.patch
+++ b/target/linux/generic/backport-6.1/807-v6.5-05-net-dsa-mv88e6xxx-pass-mv88e6xxx_chip-structure-to-p.patch
@@ -24,7 +24,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3340,7 +3340,7 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3350,7 +3350,7 @@ static int mv88e6xxx_setup_port(struct m
                caps = pl_config.mac_capabilities;
  
                if (chip->info->ops->port_max_speed_mode)
@@ -35,7 +35,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
 --- a/drivers/net/dsa/mv88e6xxx/chip.h
 +++ b/drivers/net/dsa/mv88e6xxx/chip.h
-@@ -508,7 +508,8 @@ struct mv88e6xxx_ops {
+@@ -514,7 +514,8 @@ struct mv88e6xxx_ops {
                                     int speed, int duplex);
  
        /* What interface mode should be used for maximum speed? */

diff --git a/target/linux/generic/backport-6.1/807-v6.5-06-net-dsa-mv88e6xxx-enable-support-for-88E6361-switch.patch b/target/linux/generic/backport-6.1/807-v6.5-06-net-dsa-mv88e6xxx-enable-support-for-88E6361-switch.patch
index 220fec68c32c7f4a4ba43fd926a2612e44b17ee0..471e6a3903d49aba2e1c61fe63e1fffe9256af26 100644 (file)
--- a/target/linux/generic/backport-6.1/807-v6.5-06-net-dsa-mv88e6xxx-enable-support-for-88E6361-switch.patch
+++ b/target/linux/generic/backport-6.1/807-v6.5-06-net-dsa-mv88e6xxx-enable-support-for-88E6361-switch.patch
@@ -58,7 +58,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                }
        }
  
-@@ -6243,6 +6249,32 @@ static const struct mv88e6xxx_info mv88e
+@@ -6285,6 +6291,32 @@ static const struct mv88e6xxx_info mv88e
                .ptp_support = true,
                .ops = &mv88e6352_ops,
        },

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 671556fbaa8228a5ac4f63828a0e8dd8e7cc723b..c11ccc6c3e028048db29c1ed363f1dba5fd6af81 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
@@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * of_find_node_by_phandle - Find a node given a phandle
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -2330,8 +2330,8 @@ of_register_spi_device(struct spi_contro
+@@ -2334,8 +2334,8 @@ of_register_spi_device(struct spi_contro
        }
  
        /* Select device driver */

diff --git a/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index c82ca3edd8402e24a2e4192f96e64f998369d641..a87b41370e9946136e3abda03f8a415283347998 100644 (file)
--- a/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -1098,6 +1099,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1100,6 +1101,8 @@ int mtd_device_parse_register(struct mtd
                register_reboot_notifier(&mtd->reboot_notifier);
        }
  

diff --git a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
index 54f654ccabc561c2332138acce89ba7332bd1b5c..75907bf4720102d5cdbf8f2f4f91782ec82456b7 100644 (file)
--- a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
+++ b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3500,6 +3500,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3510,6 +3510,9 @@ static int mv88e6xxx_setup_port(struct m
        else
                reg = 1 << port;
  

diff --git a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch
index 696a78e53ea9fd80297224cc335578e553e61625..c6306c85ccb14247b0dc65826ec703ae9a5ecffb 100644 (file)
--- a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch
+++ b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -3060,6 +3060,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -3071,6 +3071,10 @@ static inline int pskb_trim(struct sk_bu
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
-@@ -3209,16 +3213,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -3220,16 +3224,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  

diff --git a/target/linux/generic/pending-6.1/630-packet_socket_type.patch b/target/linux/generic/pending-6.1/630-packet_socket_type.patch
index c40c7096352038428a8cf7c654478b64a49fe4f4..9c8be72745a3fc7f43e97722b14649206f1c9da9 100644 (file)
--- a/target/linux/generic/pending-6.1/630-packet_socket_type.patch
+++ b/target/linux/generic/pending-6.1/630-packet_socket_type.patch
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -3378,6 +3380,7 @@ static int packet_create(struct net *net
+@@ -3377,6 +3379,7 @@ static int packet_create(struct net *net
        mutex_init(&po->pg_vec_lock);
        po->rollover = NULL;
        po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
-@@ -4013,6 +4016,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -4012,6 +4015,16 @@ packet_setsockopt(struct socket *sock, i
                WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);
                return 0;
        }
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        default:
                return -ENOPROTOOPT;
        }
-@@ -4069,6 +4082,13 @@ static int packet_getsockopt(struct sock
+@@ -4068,6 +4081,13 @@ static int packet_getsockopt(struct sock
        case PACKET_VNET_HDR:
                val = po->has_vnet_hdr;
                break;

diff --git a/target/linux/generic/pending-6.1/655-increase_skb_pad.patch b/target/linux/generic/pending-6.1/655-increase_skb_pad.patch
index 9d77ceaf938d78dcb7049d8ae77bac20b40b61da..22c479311a496bdf09fda88e7df465bd73bf6311 100644 (file)
--- a/target/linux/generic/pending-6.1/655-increase_skb_pad.patch
+++ b/target/linux/generic/pending-6.1/655-increase_skb_pad.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -3027,7 +3027,7 @@ static inline int pskb_network_may_pull(
+@@ -3038,7 +3038,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD

diff --git a/target/linux/generic/pending-6.1/760-net-core-add-optional-threading-for-backlog-processi.patch b/target/linux/generic/pending-6.1/760-net-core-add-optional-threading-for-backlog-processi.patch
index 6ccc3eb389833d49c9f2c1c34946667b48d86f31..7d5727bda683aa817dc9c36efbcb7b6d37ea8077 100644 (file)
--- a/target/linux/generic/pending-6.1/760-net-core-add-optional-threading-for-backlog-processi.patch
+++ b/target/linux/generic/pending-6.1/760-net-core-add-optional-threading-for-backlog-processi.patch
@@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  void netif_napi_add_weight(struct net_device *dev, struct napi_struct *napi,
                           int (*poll)(struct napi_struct *, int), int weight)
  {
-@@ -11126,6 +11197,9 @@ static int dev_cpu_dead(unsigned int old
+@@ -11127,6 +11198,9 @@ static int dev_cpu_dead(unsigned int old
        raise_softirq_irqoff(NET_TX_SOFTIRQ);
        local_irq_enable();
  
@@ -167,7 +167,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #ifdef CONFIG_RPS
        remsd = oldsd->rps_ipi_list;
        oldsd->rps_ipi_list = NULL;
-@@ -11438,6 +11512,7 @@ static int __init net_dev_init(void)
+@@ -11439,6 +11513,7 @@ static int __init net_dev_init(void)
                INIT_CSD(&sd->defer_csd, trigger_rx_softirq, sd);
                spin_lock_init(&sd->defer_lock);
  

diff --git a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
index 1d4b18653eb3f1510880480fe1d205d2b29e08f5..13a4d190ee7cabc0a80a7e761ca8ff55256eb386 100644 (file)
--- a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
+++ b/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -7037,6 +7037,7 @@ static int mv88e6xxx_register_switch(str
+@@ -7079,6 +7079,7 @@ static int mv88e6xxx_register_switch(str
        ds->ops = &mv88e6xxx_switch_ops;
        ds->ageing_time_min = chip->info->age_time_coeff;
        ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

diff --git a/target/linux/generic/pending-6.1/860-serial-8250_mtk-track-busclk-state-to-avoid-bus-error.patch b/target/linux/generic/pending-6.1/860-serial-8250_mtk-track-busclk-state-to-avoid-bus-error.patch
index c5db5d9491d41032c42dc8eb58b3d5d0ae1b0c93..013261cb8f1136c8d269d20c3869da2ef3d95fcf 100644 (file)
--- a/target/linux/generic/pending-6.1/860-serial-8250_mtk-track-busclk-state-to-avoid-bus-error.patch
+++ b/target/linux/generic/pending-6.1/860-serial-8250_mtk-track-busclk-state-to-avoid-bus-error.patch
@@ -42,7 +42,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #define MTK_UART_IER_XOFFI    0x20    /* Enable XOFF character interrupt */
  #define MTK_UART_IER_RTSI     0x40    /* Enable RTS Modem status interrupt */
  #define MTK_UART_IER_CTSI     0x80    /* Enable CTS Modem status interrupt */
-@@ -418,13 +418,12 @@ static int __maybe_unused mtk8250_runtim
+@@ -422,13 +422,12 @@ static int __maybe_unused mtk8250_runtim
        struct mtk8250_data *data = dev_get_drvdata(dev);
        struct uart_8250_port *up = serial8250_get_port(data->line);