kernel: bump 5.15 to 5.15.149

Removed because it is upstream:
generic/pending-5.15/540-ksmbd-only-v2-leases-handle-the-directory.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=81ea755b8fa57ce186f56f14b709cf491c2a5505

Manually Adapted the following patches:
ath79/patches-5.15/900-unaligned_access_hacks.patch
ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 26d1d5240356e2c286ca87dbaea3308c0e9bc97f)

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index d93ae194b8aa1c715dee83f947695af6b53f0fb2..9ab2d04fc65ccae857a6e977ac64400eab93ebb7 100644 (file)
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .148
-LINUX_KERNEL_HASH-5.15.148 = c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8
+LINUX_VERSION-5.15 = .149
+LINUX_KERNEL_HASH-5.15.149 = bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0

diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
index 7bd6ae8b5606a9174615ef8c2e4cff3340644d07..3c15a016ff8fa64d3da8ca46fb8bc0c83870620d 100644 (file)
--- a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
@@ -86,7 +86,7 @@ SVN-Revision: 35130
        } while (word != stop);
  
        return csum_fold(csum);
        } while (word != stop);
  
        return csum_fold(csum);

-@@ -182,73 +186,6 @@ static inline __sum16 ip_compute_csum(co
+@@ -182,74 +186,6 @@ static inline __sum16 ip_compute_csum(co

        return csum_fold(csum_partial(buff, len, 0));
  }
  
        return csum_fold(csum_partial(buff, len, 0));
  }
  


@@ -152,7 +152,8 @@ SVN-Revision: 35130
 -      "       .set    pop"
 -      : "=&r" (sum), "=&r" (tmp)
 -      : "r" (saddr), "r" (daddr),
 -      "       .set    pop"
 -      : "=&r" (sum), "=&r" (tmp)
 -      : "r" (saddr), "r" (daddr),

--        "0" (htonl(len)), "r" (htonl(proto)), "r" (sum));
+-        "0" (htonl(len)), "r" (htonl(proto)), "r" (sum)
+-      : "memory");

 -
 -      return csum_fold(sum);
 -}
 -
 -      return csum_fold(sum);
 -}


@@ -336,7 +337,7 @@ SVN-Revision: 35130
  #endif /* _LINUX_TYPES_H */
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
  #endif /* _LINUX_TYPES_H */
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c

-@@ -1477,8 +1477,8 @@ struct sk_buff *inet_gro_receive(struct
+@@ -1480,8 +1480,8 @@ struct sk_buff *inet_gro_receive(struct

        if (unlikely(ip_fast_csum((u8 *)iph, 5)))
                goto out_unlock;
  
        if (unlikely(ip_fast_csum((u8 *)iph, 5)))
                goto out_unlock;
  

diff --git a/target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch
index 4743ad46e2522e6b3c4654d86e1e86959e14b925..16c8f11af75317e29ab65ae8671eeca5dd579af2 100644 (file)
--- a/target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch
+++ b/target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch
@@ -45,7 +45,7 @@ Submitted-by: Christopher Hill <ch6574@gmail.com>
 
 --- a/drivers/mfd/Kconfig
 +++ b/drivers/mfd/Kconfig
 
 --- a/drivers/mfd/Kconfig
 +++ b/drivers/mfd/Kconfig

-@@ -2176,6 +2176,14 @@ config RAVE_SP_CORE
+@@ -2177,6 +2177,14 @@ config RAVE_SP_CORE

          Select this to get support for the Supervisory Processor
          device found on several devices in RAVE line of hardware.
  
          Select this to get support for the Supervisory Processor
          device found on several devices in RAVE line of hardware.
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch
index 49283f55630e7a52cae46fe97ade1c84554f130b..b07d81aa2e5c3122f6001d487cc1d9150da59bfc 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch
@@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  }
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
  }
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c

-@@ -5659,7 +5659,7 @@ static void port_event(struct usb_hub *h
+@@ -5667,7 +5667,7 @@ static void port_event(struct usb_hub *h

                port_dev->over_current_count++;
                port_over_current_notify(port_dev);
  
                port_dev->over_current_count++;
                port_over_current_notify(port_dev);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
index 848ac83e3a0618399ad06ff787d5770c0f6cac8a..bc655e92743a1cd51da15825849afd799aceedb5 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
@@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
  static inline int mmc_blk_part_switch(struct mmc_card *card,
                                      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
  static inline int mmc_blk_part_switch(struct mmc_card *card,
                                      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,

-@@ -2946,6 +2953,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2986,6 +2993,8 @@ static int mmc_blk_probe(struct mmc_card

  {
        struct mmc_blk_data *md;
        int ret = 0;
  {
        struct mmc_blk_data *md;
        int ret = 0;


@@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more
  
        /*
         * Check that the card supports the command class(es) we need.
  
        /*
         * Check that the card supports the command class(es) we need.

-@@ -2953,7 +2962,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2993,7 +3002,16 @@ static int mmc_blk_probe(struct mmc_card

        if (!(card->csd.cmdclass & CCC_BLOCK_READ))
                return -ENODEV;
  
        if (!(card->csd.cmdclass & CCC_BLOCK_READ))
                return -ENODEV;
  


@@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
  
        card->complete_wq = alloc_workqueue("mmc_complete",
                                        WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
  
        card->complete_wq = alloc_workqueue("mmc_complete",
                                        WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);

-@@ -2968,6 +2986,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3008,6 +3026,17 @@ static int mmc_blk_probe(struct mmc_card

                goto out_free;
        }
  
                goto out_free;
        }
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0144-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-5.15/950-0144-bcmgenet-Better-coalescing-parameter-defaults.patch
index ebffb634cd56257c7633783d9ab44e43a956165d..56804764e812ceb72708ecdb583af98a295a686e 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0144-bcmgenet-Better-coalescing-parameter-defaults.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0144-bcmgenet-Better-coalescing-parameter-defaults.patch
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c

-@@ -2618,7 +2618,7 @@ static void bcmgenet_init_tx_ring(struct
+@@ -2615,7 +2615,7 @@ static void bcmgenet_init_tx_ring(struct

  
        bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
        bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
  
        bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
        bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);


@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        /* Disable rate control for now */
        bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
                                  TDMA_FLOW_PERIOD);
        /* Disable rate control for now */
        bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
                                  TDMA_FLOW_PERIOD);

-@@ -4086,9 +4086,12 @@ static int bcmgenet_probe(struct platfor
+@@ -4083,9 +4083,12 @@ static int bcmgenet_probe(struct platfor

        netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
  
        /* Set default coalescing parameters */
        netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
  
        /* Set default coalescing parameters */

diff --git a/target/linux/bcm27xx/patches-5.15/950-0145-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/bcm27xx/patches-5.15/950-0145-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
index cde33a576e84379607bd69a4d39f7cbec78101bc..0e1640304b7c479c5a39dd3e7a7de42b549bcc09 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0145-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0145-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 
 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
 
 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c

-@@ -286,6 +286,8 @@ int bcmgenet_mii_probe(struct net_device
+@@ -292,6 +292,8 @@ int bcmgenet_mii_probe(struct net_device

        /* Communicate the integrated PHY revision */
        if (priv->internal_phy)
                phy_flags = priv->gphy_rev;
        /* Communicate the integrated PHY revision */
        if (priv->internal_phy)
                phy_flags = priv->gphy_rev;

diff --git a/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
index 0b6ff1a70a23cf5f2bf2d2944ee671f7f2b3e83d..4ec54a03ee321c2e479bdf951f9cde0e8869f016 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
 
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h

-@@ -225,6 +225,9 @@
+@@ -226,6 +226,9 @@

  #define USB_VENDOR_ID_BAANTO          0x2453
  #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
  
  #define USB_VENDOR_ID_BAANTO          0x2453
  #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
  


@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  

-@@ -1322,6 +1325,9 @@
+@@ -1323,6 +1326,9 @@

  #define USB_VENDOR_ID_XAT     0x2505
  #define USB_DEVICE_ID_XAT_CSR 0x0220
  
  #define USB_VENDOR_ID_XAT     0x2505
  #define USB_DEVICE_ID_XAT_CSR 0x0220
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0165-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/bcm27xx/patches-5.15/950-0165-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
index 318681ff9101a06e3df0b4a6a1fbfee7034db398..1598ffef2ded861d1b208547b55e90a87f6a3615 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0165-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0165-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
  static inline void bcmgenet_writel(u32 value, void __iomem *offset)
  {
  
  static inline void bcmgenet_writel(u32 value, void __iomem *offset)
  {

-@@ -2449,6 +2452,11 @@ static void reset_umac(struct bcmgenet_p
+@@ -2446,6 +2449,11 @@ static void reset_umac(struct bcmgenet_p

        bcmgenet_rbuf_ctrl_set(priv, 0);
        udelay(10);
  
        bcmgenet_rbuf_ctrl_set(priv, 0);
        udelay(10);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0290-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-5.15/950-0290-staging-fbtft-Add-support-for-display-variants.patch
index ec3b301be15fab95ee526bb69bc66d7833caeb5c..aa39f9f7de1ca162ab4dd4ece956b3b3a227c229 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0290-staging-fbtft-Add-support-for-display-variants.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0290-staging-fbtft-Add-support-for-display-variants.patch
@@ -95,7 +95,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
  #include <video/mipi_display.h>
  
  
  #include <video/mipi_display.h>
  

-@@ -1184,6 +1186,7 @@ static struct fbtft_platform_data *fbtft
+@@ -1186,6 +1188,7 @@ static struct fbtft_platform_data *fbtft

   * @display: Display properties
   * @sdev: SPI device
   * @pdev: Platform device
   * @display: Display properties
   * @sdev: SPI device
   * @pdev: Platform device


@@ -103,7 +103,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
   *
   * Allocates, initializes and registers a framebuffer
   *
   *
   * Allocates, initializes and registers a framebuffer
   *

-@@ -1193,12 +1196,15 @@ static struct fbtft_platform_data *fbtft
+@@ -1195,12 +1198,15 @@ static struct fbtft_platform_data *fbtft

   */
  int fbtft_probe_common(struct fbtft_display *display,
                       struct spi_device *sdev,
   */
  int fbtft_probe_common(struct fbtft_display *display,
                       struct spi_device *sdev,


@@ -120,7 +120,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        int ret;
  
        if (sdev)
        int ret;
  
        if (sdev)

-@@ -1214,6 +1220,14 @@ int fbtft_probe_common(struct fbtft_disp
+@@ -1216,6 +1222,14 @@ int fbtft_probe_common(struct fbtft_disp

                pdata = fbtft_properties_read(dev);
                if (IS_ERR(pdata))
                        return PTR_ERR(pdata);
                pdata = fbtft_properties_read(dev);
                if (IS_ERR(pdata))
                        return PTR_ERR(pdata);

diff --git a/target/linux/bcm27xx/patches-5.15/950-0292-net-bcmgenet-Reset-RBUF-on-first-open.patch b/target/linux/bcm27xx/patches-5.15/950-0292-net-bcmgenet-Reset-RBUF-on-first-open.patch
index 21cd9dfc039849f10eb8fc9f6af200ad5767355c..eb6b61a2a0f72075a1eb5036b9ea957050c8eec8 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0292-net-bcmgenet-Reset-RBUF-on-first-open.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0292-net-bcmgenet-Reset-RBUF-on-first-open.patch
@@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c

-@@ -3267,7 +3267,7 @@ static void bcmgenet_get_hw_addr(struct
+@@ -3264,7 +3264,7 @@ static void bcmgenet_get_hw_addr(struct

  }
  
  /* Returns a reusable dma control register value */
  }
  
  /* Returns a reusable dma control register value */


@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  {
        unsigned int i;
        u32 reg;
  {
        unsigned int i;
        u32 reg;

-@@ -3292,6 +3292,14 @@ static u32 bcmgenet_dma_disable(struct b
+@@ -3289,6 +3289,14 @@ static u32 bcmgenet_dma_disable(struct b

        udelay(10);
        bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
  
        udelay(10);
        bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
  


@@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        return dma_ctrl;
  }
  
        return dma_ctrl;
  }
  

-@@ -3355,8 +3363,8 @@ static int bcmgenet_open(struct net_devi
+@@ -3352,8 +3360,8 @@ static int bcmgenet_open(struct net_devi

  
        bcmgenet_set_hw_addr(priv, dev->dev_addr);
  
  
        bcmgenet_set_hw_addr(priv, dev->dev_addr);
  


@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
        /* Reinitialize TDMA and RDMA and SW housekeeping */
        ret = bcmgenet_init_dma(priv);
  
        /* Reinitialize TDMA and RDMA and SW housekeeping */
        ret = bcmgenet_init_dma(priv);

-@@ -4215,7 +4223,7 @@ static int bcmgenet_resume(struct device
+@@ -4212,7 +4220,7 @@ static int bcmgenet_resume(struct device

                        bcmgenet_hfb_create_rxnfc_filter(priv, rule);
  
        /* Disable RX/TX DMA and flush TX queues */
                        bcmgenet_hfb_create_rxnfc_filter(priv, rule);
  
        /* Disable RX/TX DMA and flush TX queues */

diff --git a/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch b/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
index c39ae5b395ba9ffa0ab3ea3717aa972ca3f7a26d..7ce40f3276b70b756fe2219fc4035d1fa7af4b94 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
@@ -157,7 +157,7 @@ Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
  static const struct drm_display_mode innolux_at070tn92_mode = {
        .clock = 33333,
        .hdisplay = 800,
  static const struct drm_display_mode innolux_at070tn92_mode = {
        .clock = 33333,
        .hdisplay = 800,

-@@ -4667,6 +4699,9 @@ static const struct of_device_id platfor
+@@ -4669,6 +4701,9 @@ static const struct of_device_id platfor

                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {
                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch b/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
index 6dc533b3fe0b1bd6a9edefcd657f98f38d0b07cc..50fbab5f78a2e258c5e1735b9e4397442985ffec 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
 
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c

-@@ -1888,6 +1888,8 @@ static const struct usb_audio_quirk_flag
+@@ -1892,6 +1892,8 @@ static const struct usb_audio_quirk_flag

                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
        DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
        DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),

diff --git a/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
index 72cefe864e313e3c11a60f5b9f55cbde5ef7c6dd..de1e0c41185439bbb6becc8b6f516eb73ffb2000 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -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 },
  static const struct display_timing rocktech_rk070er9427_timing = {
        .pixelclock = { 26400000, 33300000, 46800000 },
        .hactive = { 800, 800, 800 },

-@@ -4846,6 +4871,9 @@ static const struct of_device_id platfor
+@@ -4848,6 +4873,9 @@ static const struct of_device_id platfor

                .compatible = "qishenglong,gopher2b-lcd",
                .data = &qishenglong_gopher2b_lcd,
        }, {
                .compatible = "qishenglong,gopher2b-lcd",
                .data = &qishenglong_gopher2b_lcd,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
index 1d450282f2a67bf1500cfd1b3aa189efa17ca8af..368d06bddf38c1b80e79ea11759d45c776d209b6 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0686-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,
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
        .clock = 9000,
        .hdisplay = 480,

-@@ -4709,6 +4735,9 @@ static const struct of_device_id platfor
+@@ -4711,6 +4737,9 @@ static const struct of_device_id platfor

                .compatible = "friendlyarm,hd702e",
                .data = &friendlyarm_hd702e,
        }, {
                .compatible = "friendlyarm,hd702e",
                .data = &friendlyarm_hd702e,
        }, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0789-drm-Add-chroma-siting-properties.patch b/target/linux/bcm27xx/patches-5.15/950-0789-drm-Add-chroma-siting-properties.patch
index a6e03d3b6bcd906ae0cd8d691da354acdb1a5157..8fc79560d4978e9e242a2554c28945bceea851e7 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0789-drm-Add-chroma-siting-properties.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0789-drm-Add-chroma-siting-properties.patch
@@ -106,7 +106,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
   * @tests: bitmask of tests to run
 --- a/include/drm/drm_color_mgmt.h
 +++ b/include/drm/drm_color_mgmt.h
   * @tests: bitmask of tests to run
 --- a/include/drm/drm_color_mgmt.h
 +++ b/include/drm/drm_color_mgmt.h

-@@ -93,6 +93,9 @@ int drm_plane_create_color_properties(st
+@@ -94,6 +94,9 @@ int drm_plane_create_color_properties(st

                                      enum drm_color_encoding default_encoding,
                                      enum drm_color_range default_range);
  
                                      enum drm_color_encoding default_encoding,
                                      enum drm_color_range default_range);
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch b/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch
index 7c452f7c82a642b1919ac88e5223906a110e12c5..d34f37b3be32d0dee4f78d9027eeb6d0dffef66f 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch
@@ -11,7 +11,7 @@ This reverts commit 2388f826cdc9af2651991adc0feb79de9bdf2232.
 
 --- a/drivers/video/fbdev/core/fbmem.c
 +++ b/drivers/video/fbdev/core/fbmem.c
 
 --- a/drivers/video/fbdev/core/fbmem.c
 +++ b/drivers/video/fbdev/core/fbmem.c

-@@ -1631,14 +1631,7 @@ static void do_remove_conflicting_frameb
+@@ -1635,14 +1635,7 @@ static void do_remove_conflicting_frameb

                         * If it's not a platform device, at least print a warning. A
                         * fix would add code to remove the device from the system.
                         */
                         * If it's not a platform device, at least print a warning. A
                         * fix would add code to remove the device from the system.
                         */

diff --git a/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch b/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch
index a9a3998b87b644e2875ab21ad8cda9e8c5d8ca60..92a4b2206afc50d223ae82036c856f34f6c179e6 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch
@@ -20,7 +20,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a.
  #include <linux/seq_file.h>
  #include <linux/console.h>
  #include <linux/kmod.h>
  #include <linux/seq_file.h>
  #include <linux/console.h>
  #include <linux/kmod.h>

-@@ -1608,36 +1607,18 @@ static void do_remove_conflicting_frameb
+@@ -1612,36 +1611,18 @@ static void do_remove_conflicting_frameb

        /* check all firmware fbs and kick off if the base addr overlaps */
        for_each_registered_fb(i) {
                struct apertures_struct *gen_aper;
        /* check all firmware fbs and kick off if the base addr overlaps */
        for_each_registered_fb(i) {
                struct apertures_struct *gen_aper;


@@ -58,7 +58,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a.
                }
        }
  }
                }
        }
  }

-@@ -1975,13 +1956,9 @@ EXPORT_SYMBOL(register_framebuffer);
+@@ -1979,13 +1960,9 @@ EXPORT_SYMBOL(register_framebuffer);

  void
  unregister_framebuffer(struct fb_info *fb_info)
  {
  void
  unregister_framebuffer(struct fb_info *fb_info)
  {


@@ -76,7 +76,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a.
  
 --- a/include/linux/fb.h
 +++ b/include/linux/fb.h
  
 --- a/include/linux/fb.h
 +++ b/include/linux/fb.h

-@@ -502,7 +502,6 @@ struct fb_info {
+@@ -513,7 +513,6 @@ struct fb_info {

        } *apertures;
  
        bool skip_vt_switch; /* no VT switch on suspend/resume required */
        } *apertures;
  
        bool skip_vt_switch; /* no VT switch on suspend/resume required */

diff --git a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
index 604acfacc0f3d6e08a5b51093f4ceaedc0034ac2..4b2d83bb9a663f5db1787819a4fc1f10d5e0199e 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c

-@@ -1890,7 +1890,11 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1930,7 +1930,11 @@ static void mmc_blk_mq_rw_recovery(struc

                return;
        }
  
                return;
        }
  

diff --git a/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch b/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
index 27c85a333b3eea5dd28a90d25950dcbccf0e5640..2ea2e2497acc7566ae56ce5dd62538bc5b03e152 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
@@ -73,7 +73,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 
 --- a/arch/Kconfig
 +++ b/arch/Kconfig
 
 --- a/arch/Kconfig
 +++ b/arch/Kconfig

-@@ -1298,6 +1298,14 @@ config ARCH_HAS_ELFCORE_COMPAT
+@@ -1299,6 +1299,14 @@ config ARCH_HAS_ELFCORE_COMPAT

  config ARCH_HAS_PARANOID_L1D_FLUSH
        bool
  
  config ARCH_HAS_PARANOID_L1D_FLUSH
        bool
  

diff --git a/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch b/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch
index 1e8afb7bbf574f96d9251998c7268a8725b53de3..8cd86e0fcb55b395eb1875432f509335b73a189a 100644 (file)
--- a/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch
+++ b/target/linux/generic/backport-5.15/346-v5.18-02-Revert-usb-host-xhci-mvebu-make-USB-3.0-PHY-optional.patch
@@ -138,7 +138,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
        .init_quirk = xhci_mvebu_a3700_init_quirk,
  };
  
        .init_quirk = xhci_mvebu_a3700_init_quirk,
  };
  

-@@ -341,14 +330,7 @@ static int xhci_plat_probe(struct platfo
+@@ -344,14 +333,7 @@ static int xhci_plat_probe(struct platfo

  
        hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
        xhci->shared_hcd->tpl_support = hcd->tpl_support;
  
        hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
        xhci->shared_hcd->tpl_support = hcd->tpl_support;

diff --git a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
index eca3c7ff9fd1873d41418ba4898ff208c0020be9..5737da6e10f97c89221078f60d46312a36a441ee 100644 (file)
--- a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
+++ b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
@@ -726,7 +726,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
         * to advertise both, only report advertising at 2500BaseX.
 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
 +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
         * to advertise both, only report advertising at 2500BaseX.
 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
 +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

-@@ -6352,15 +6352,14 @@ static void mvpp2_phylink_validate(struc
+@@ -6377,15 +6377,14 @@ static void mvpp2_phylink_validate(struc

                goto empty_set;
        }
  
                goto empty_set;
        }
  

diff --git a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
index 931c589cfa390880debe624614bbd9ba2355382c..7742c4a9580081b185bb3d72703411a0652ac581 100644 (file)
--- a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
@@ -87,7 +87,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        stmmac_clear_tx_descriptors(priv, queue);
  
        stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
        stmmac_clear_tx_descriptors(priv, queue);
  
        stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,

-@@ -7415,6 +7410,25 @@ int stmmac_suspend(struct device *dev)
+@@ -7418,6 +7413,25 @@ int stmmac_suspend(struct device *dev)

  }
  EXPORT_SYMBOL_GPL(stmmac_suspend);
  
  }
  EXPORT_SYMBOL_GPL(stmmac_suspend);
  


@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  /**
   * stmmac_reset_queues_param - reset queue parameters
   * @priv: device pointer
  /**
   * stmmac_reset_queues_param - reset queue parameters
   * @priv: device pointer

-@@ -7425,22 +7439,11 @@ static void stmmac_reset_queues_param(st
+@@ -7428,22 +7442,11 @@ static void stmmac_reset_queues_param(st

        u32 tx_cnt = priv->plat->tx_queues_to_use;
        u32 queue;
  
        u32 tx_cnt = priv->plat->tx_queues_to_use;
        u32 queue;
  

diff --git a/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch b/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch
index c59a5d1fe1782df4184d3571fe44b29c784f9cca..e259668b86b854488f936cda0fa59682f58c51f8 100644 (file)
--- a/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch
@@ -1210,7 +1210,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        if (netif_running(dev))
                ret = stmmac_open(dev);
  
        if (netif_running(dev))
                ret = stmmac_open(dev);

-@@ -7360,7 +7364,7 @@ int stmmac_suspend(struct device *dev)
+@@ -7363,7 +7367,7 @@ int stmmac_suspend(struct device *dev)

        stmmac_disable_all_queues(priv);
  
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
        stmmac_disable_all_queues(priv);
  
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)


@@ -1219,7 +1219,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        if (priv->eee_enabled) {
                priv->tx_path_in_lpi_mode = false;
  
        if (priv->eee_enabled) {
                priv->tx_path_in_lpi_mode = false;

-@@ -7412,7 +7416,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend);
+@@ -7415,7 +7419,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend);

  
  static void stmmac_reset_rx_queue(struct stmmac_priv *priv, u32 queue)
  {
  
  static void stmmac_reset_rx_queue(struct stmmac_priv *priv, u32 queue)
  {


@@ -1228,7 +1228,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        rx_q->cur_rx = 0;
        rx_q->dirty_rx = 0;
  
        rx_q->cur_rx = 0;
        rx_q->dirty_rx = 0;

-@@ -7420,7 +7424,7 @@ static void stmmac_reset_rx_queue(struct
+@@ -7423,7 +7427,7 @@ static void stmmac_reset_rx_queue(struct

  
  static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue)
  {
  
  static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue)
  {

diff --git a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch
index bdf8b8585e214eeb69577628c27894f0d19d926c..e82f6d6943c2cc310c9f0c0352986cf57d05944c 100644 (file)
--- a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch
@@ -1150,7 +1150,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  dma_desc_error:
        return ret;
  }
  dma_desc_error:
        return ret;
  }

-@@ -7507,7 +7623,7 @@ int stmmac_resume(struct device *dev)
+@@ -7510,7 +7626,7 @@ int stmmac_resume(struct device *dev)

        stmmac_reset_queues_param(priv);
  
        stmmac_free_tx_skbufs(priv);
        stmmac_reset_queues_param(priv);
  
        stmmac_free_tx_skbufs(priv);

diff --git a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
index 13a16b6fa0824044f19073e8b3ae495f286b45b3..25935e9d7950fc204e65230933462015e97cc857 100644 (file)
--- a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
+++ b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
@@ -105,7 +105,7 @@ Subject: [PATCH] kernel: add block fit partition parser
        /* everything is up and running, commence */
        err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
        if (err)
        /* everything is up and running, commence */
        err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
        if (err)

-@@ -595,6 +607,11 @@ static bool blk_add_partition(struct gen
+@@ -600,6 +612,11 @@ static bool blk_add_partition(struct gen

            (state->parts[p].flags & ADDPART_FLAG_RAID))
                md_autodetect_dev(part->bd_dev);
  
            (state->parts[p].flags & ADDPART_FLAG_RAID))
                md_autodetect_dev(part->bd_dev);
  

diff --git a/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
index 930d0ff0fe426d50bc796e44905b2ea42e9cbc3e..1c169b7266b802ada0b0e989698df05d521ce0f5 100644 (file)
--- a/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
+++ b/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                }
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
                }
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh

-@@ -257,6 +257,10 @@ kallsyms()
+@@ -262,6 +262,10 @@ kallsyms()

                kallsymopt="${kallsymopt} --base-relative"
        fi
  
                kallsymopt="${kallsymopt} --base-relative"
        fi
  

diff --git a/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 2f6fbd59e4365eb87269b3062bb7d5f6d02bf79b..3931278a6df4818cd00a2bf4d0d2fff629c59637 100644 (file)
--- a/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -275,8 +275,8 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
                         const struct tnl_ptk_info *tpi,
                         struct metadata_dst *tun_dst,
  static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
                         const struct tnl_ptk_info *tpi,
                         struct metadata_dst *tun_dst,

-@@ -843,6 +969,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
-       skb_reset_network_header(skb);
+@@ -857,6 +983,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
+ 

        memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
  
 +      if (tpi->proto == htons(ETH_P_IP) && tunnel->parms.fmrs &&
        memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
  
 +      if (tpi->proto == htons(ETH_P_IP) && tunnel->parms.fmrs &&


@@ -303,7 +303,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        __skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
  
        err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
        __skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
  
        err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);

-@@ -994,6 +1141,7 @@ static void init_tel_txopt(struct ipv6_t
+@@ -1004,6 +1151,7 @@ static void init_tel_txopt(struct ipv6_t

        opt->ops.opt_nflen = 8;
  }
  
        opt->ops.opt_nflen = 8;
  }
  


@@ -311,7 +311,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  /**
   * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
   *   @t: the outgoing tunnel device
  /**
   * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
   *   @t: the outgoing tunnel device

-@@ -1274,6 +1422,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1284,6 +1432,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str

                u8 protocol)
  {
        struct ip6_tnl *t = netdev_priv(dev);
                u8 protocol)
  {
        struct ip6_tnl *t = netdev_priv(dev);


@@ -319,7 +319,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        struct ipv6hdr *ipv6h;
        const struct iphdr  *iph;
        int encap_limit = -1;
        struct ipv6hdr *ipv6h;
        const struct iphdr  *iph;
        int encap_limit = -1;

-@@ -1373,6 +1522,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1383,6 +1532,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str

        fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
        dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield);
  
        fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
        dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield);
  


@@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
                return -1;
  
        if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
                return -1;
  

-@@ -1526,6 +1687,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -1536,6 +1697,14 @@ ip6_tnl_change(struct ip6_tnl *t, const

        t->parms.link = p->link;
        t->parms.proto = p->proto;
        t->parms.fwmark = p->fwmark;
        t->parms.link = p->link;
        t->parms.proto = p->proto;
        t->parms.fwmark = p->fwmark;


@@ -353,7 +353,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        dst_cache_reset(&t->dst_cache);
        ip6_tnl_link_config(t);
        return 0;
        dst_cache_reset(&t->dst_cache);
        ip6_tnl_link_config(t);
        return 0;

-@@ -1564,6 +1733,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+@@ -1574,6 +1743,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_

        p->flowinfo = u->flowinfo;
        p->link = u->link;
        p->proto = u->proto;
        p->flowinfo = u->flowinfo;
        p->link = u->link;
        p->proto = u->proto;


@@ -361,7 +361,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        memcpy(p->name, u->name, sizeof(u->name));
  }
  
        memcpy(p->name, u->name, sizeof(u->name));
  }
  

-@@ -1950,6 +2120,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -1960,6 +2130,15 @@ static int ip6_tnl_validate(struct nlatt

        return 0;
  }
  
        return 0;
  }
  


@@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
                                  struct __ip6_tnl_parm *parms)
  {
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
                                  struct __ip6_tnl_parm *parms)
  {

-@@ -1987,6 +2166,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -1997,6 +2176,46 @@ static void ip6_tnl_netlink_parms(struct

  
        if (data[IFLA_IPTUN_FWMARK])
                parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
  
        if (data[IFLA_IPTUN_FWMARK])
                parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);


@@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  }
  
  static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
  }
  
  static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],

-@@ -2102,6 +2321,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -2112,6 +2331,12 @@ static void ip6_tnl_dellink(struct net_d

  
  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {
  
  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {


@@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        return
                /* IFLA_IPTUN_LINK */
                nla_total_size(4) +
        return
                /* IFLA_IPTUN_LINK */
                nla_total_size(4) +

-@@ -2131,6 +2356,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -2141,6 +2366,24 @@ static size_t ip6_tnl_get_size(const str

                nla_total_size(0) +
                /* IFLA_IPTUN_FWMARK */
                nla_total_size(4) +
                nla_total_size(0) +
                /* IFLA_IPTUN_FWMARK */
                nla_total_size(4) +


@@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
                0;
  }
  
                0;
  }
  

-@@ -2138,6 +2381,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2148,6 +2391,9 @@ static int ip6_tnl_fill_info(struct sk_b

  {
        struct ip6_tnl *tunnel = netdev_priv(dev);
        struct __ip6_tnl_parm *parm = &tunnel->parms;
  {
        struct ip6_tnl *tunnel = netdev_priv(dev);
        struct __ip6_tnl_parm *parm = &tunnel->parms;


@@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  
        if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
            nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
  
        if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
            nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||

-@@ -2147,9 +2393,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2157,9 +2403,27 @@ static int ip6_tnl_fill_info(struct sk_b

            nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
            nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
            nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
            nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
            nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
            nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||


@@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
            nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
            nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
        if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
            nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
            nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||

-@@ -2189,6 +2453,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -2199,6 +2463,7 @@ static const struct nla_policy ip6_tnl_p

        [IFLA_IPTUN_ENCAP_DPORT]        = { .type = NLA_U16 },
        [IFLA_IPTUN_COLLECT_METADATA]   = { .type = NLA_FLAG },
        [IFLA_IPTUN_FWMARK]             = { .type = NLA_U32 },
        [IFLA_IPTUN_ENCAP_DPORT]        = { .type = NLA_U16 },
        [IFLA_IPTUN_COLLECT_METADATA]   = { .type = NLA_FLAG },
        [IFLA_IPTUN_FWMARK]             = { .type = NLA_U32 },

diff --git a/target/linux/generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
index 606e0535137a281ad6d5124b2e7c08077eacc950..df5bef9fcd18bd71b15ab0c5fb2bae7f8094c295 100644 (file)
--- a/target/linux/generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
+++ b/target/linux/generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
@@ -55,7 +55,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  
 --- a/net/netfilter/nft_flow_offload.c
 +++ b/net/netfilter/nft_flow_offload.c
  
 --- a/net/netfilter/nft_flow_offload.c
 +++ b/net/netfilter/nft_flow_offload.c

-@@ -446,47 +446,14 @@ static struct nft_expr_type nft_flow_off
+@@ -451,47 +451,14 @@ static struct nft_expr_type nft_flow_off

        .owner          = THIS_MODULE,
  };
  
        .owner          = THIS_MODULE,
  };
  

diff --git a/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
index 892887c423663fa9b6a23f2671a1f00385ed349e..69ff9d579724c0d962265cb08d9b06fb39b895e0 100644 (file)
--- a/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
+++ b/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c

-@@ -7752,7 +7752,7 @@ static int nft_register_flowtable_net_ho
+@@ -7760,7 +7760,7 @@ static int nft_register_flowtable_net_ho

                err = flowtable->data.type->setup(&flowtable->data,
                                                  hook->ops.dev,
                                                  FLOW_BLOCK_BIND);
                err = flowtable->data.type->setup(&flowtable->data,
                                                  hook->ops.dev,
                                                  FLOW_BLOCK_BIND);

diff --git a/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
index 2a57a7ef03505aad4abec47ff39be336a8977e01..8e2f3a9475d7cb02b8eaeca85bd2bd3363ed7156 100644 (file)
--- a/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
+++ b/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
@@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
 
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
 
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c

-@@ -4358,6 +4358,15 @@ int skb_gro_receive(struct sk_buff *p, s
+@@ -4359,6 +4359,15 @@ int skb_gro_receive(struct sk_buff *p, s

        if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
                return -E2BIG;
  
        if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
                return -E2BIG;
  

diff --git a/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch b/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch
index 2f728fefd73e0c5489d0b65952aafdfe7fc2c1aa..6402dd9066aad38506b5f55600d85fdef88d68ec 100644 (file)
--- a/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch
+++ b/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch
@@ -20,7 +20,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 
 --- a/drivers/bus/mhi/host/main.c
 +++ b/drivers/bus/mhi/host/main.c
 
 --- a/drivers/bus/mhi/host/main.c
 +++ b/drivers/bus/mhi/host/main.c

-@@ -891,6 +891,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_
+@@ -896,6 +896,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_

                        switch (event) {
                        case MHI_EE_SBL:
                                st = DEV_ST_TRANSITION_SBL;
                        switch (event) {
                        case MHI_EE_SBL:
                                st = DEV_ST_TRANSITION_SBL;

diff --git a/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch
index 153b5d06cfde429efeb0e3983f2fc8132ccc7d4b..f7f16ee37d7ed025abcbe8ab710d26fadb63ed5f 100644 (file)
--- a/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/pending-5.15/810-pci_disable_common_quirks.patch
@@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * The Mellanox Tavor device gives false positive parity errors.  Disable
   * parity error reporting.
  /*
   * The Mellanox Tavor device gives false positive parity errors.  Disable
   * parity error reporting.

-@@ -3365,6 +3366,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -3368,6 +3369,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I

  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
  
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
  


@@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
   * To work around this, query the size it should be configured to by the
  /*
   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
   * To work around this, query the size it should be configured to by the

-@@ -3390,6 +3393,8 @@ static void quirk_intel_ntb(struct pci_d
+@@ -3393,6 +3396,8 @@ static void quirk_intel_ntb(struct pci_d

  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
  
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
  


@@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * Some BIOS implementations leave the Intel GPU interrupts enabled, even
   * though no one is handling them (e.g., if the i915 driver is never
  /*
   * Some BIOS implementations leave the Intel GPU interrupts enabled, even
   * though no one is handling them (e.g., if the i915 driver is never

-@@ -3428,6 +3433,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3431,6 +3436,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN

  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
  
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
  

diff --git a/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch b/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch
index 12d5191b0bb503fdcbb25d6e478e1875cb97bf21..38379224e98246ee4ba4add05d3d4f0288dbdb77 100644 (file)
--- a/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch
+++ b/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch
@@ -56,7 +56,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
  
        if (freq < min_freq) {
                freq = min_freq;
  
        if (freq < min_freq) {
                freq = min_freq;

-@@ -785,6 +786,7 @@ struct devfreq *devfreq_add_device(struc
+@@ -805,6 +806,7 @@ struct devfreq *devfreq_add_device(struc

  {
        struct devfreq *devfreq;
        struct devfreq_governor *governor;
  {
        struct devfreq *devfreq;
        struct devfreq_governor *governor;


@@ -64,7 +64,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
        int err = 0;
  
        if (!dev || !profile || !governor_name) {
        int err = 0;
  
        if (!dev || !profile || !governor_name) {

-@@ -849,6 +851,8 @@ struct devfreq *devfreq_add_device(struc
+@@ -869,6 +871,8 @@ struct devfreq *devfreq_add_device(struc

                goto err_dev;
        }
  
                goto err_dev;
        }
  


@@ -73,7 +73,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
        devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
        devfreq->opp_table = dev_pm_opp_get_opp_table(dev);
        if (IS_ERR(devfreq->opp_table))
        devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
        devfreq->opp_table = dev_pm_opp_get_opp_table(dev);
        if (IS_ERR(devfreq->opp_table))

-@@ -1560,7 +1564,7 @@ static ssize_t min_freq_show(struct devi
+@@ -1580,7 +1584,7 @@ static ssize_t min_freq_show(struct devi

        unsigned long min_freq, max_freq;
  
        mutex_lock(&df->lock);
        unsigned long min_freq, max_freq;
  
        mutex_lock(&df->lock);


@@ -82,7 +82,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
        mutex_unlock(&df->lock);
  
        return sprintf(buf, "%lu\n", min_freq);
        mutex_unlock(&df->lock);
  
        return sprintf(buf, "%lu\n", min_freq);

-@@ -1614,7 +1618,7 @@ static ssize_t max_freq_show(struct devi
+@@ -1634,7 +1638,7 @@ static ssize_t max_freq_show(struct devi

        unsigned long min_freq, max_freq;
  
        mutex_lock(&df->lock);
        unsigned long min_freq, max_freq;
  
        mutex_lock(&df->lock);


@@ -91,7 +91,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
        mutex_unlock(&df->lock);
  
        return sprintf(buf, "%lu\n", max_freq);
        mutex_unlock(&df->lock);
  
        return sprintf(buf, "%lu\n", max_freq);

-@@ -1928,7 +1932,7 @@ static int devfreq_summary_show(struct s
+@@ -1969,7 +1973,7 @@ static int devfreq_summary_show(struct s

  
                mutex_lock(&devfreq->lock);
                cur_freq = devfreq->previous_freq;
  
                mutex_lock(&devfreq->lock);
                cur_freq = devfreq->previous_freq;

diff --git a/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch b/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch
index c076845a00de919219a220bb779590655900e6a1..64f091e9e1591060a69d6cfe333a7fcb50351969 100644 (file)
--- a/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch
+++ b/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch
@@ -126,7 +126,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
                devfreq->stats.total_trans++;
        }
  
                devfreq->stats.total_trans++;
        }
  

-@@ -835,6 +831,9 @@ struct devfreq *devfreq_add_device(struc
+@@ -855,6 +851,9 @@ struct devfreq *devfreq_add_device(struc

                if (err < 0)
                        goto err_dev;
                mutex_lock(&devfreq->lock);
                if (err < 0)
                        goto err_dev;
                mutex_lock(&devfreq->lock);


@@ -136,7 +136,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
        }
  
        devfreq->scaling_min_freq = find_available_min_freq(devfreq);
        }
  
        devfreq->scaling_min_freq = find_available_min_freq(devfreq);

-@@ -870,8 +869,8 @@ struct devfreq *devfreq_add_device(struc
+@@ -890,8 +889,8 @@ struct devfreq *devfreq_add_device(struc

  
        devfreq->stats.trans_table = devm_kzalloc(&devfreq->dev,
                        array3_size(sizeof(unsigned int),
  
        devfreq->stats.trans_table = devm_kzalloc(&devfreq->dev,
                        array3_size(sizeof(unsigned int),


@@ -147,7 +147,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
                        GFP_KERNEL);
        if (!devfreq->stats.trans_table) {
                mutex_unlock(&devfreq->lock);
                        GFP_KERNEL);
        if (!devfreq->stats.trans_table) {
                mutex_unlock(&devfreq->lock);

-@@ -880,7 +879,7 @@ struct devfreq *devfreq_add_device(struc
+@@ -900,7 +899,7 @@ struct devfreq *devfreq_add_device(struc

        }
  
        devfreq->stats.time_in_state = devm_kcalloc(&devfreq->dev,
        }
  
        devfreq->stats.time_in_state = devm_kcalloc(&devfreq->dev,


@@ -156,7 +156,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
                        sizeof(*devfreq->stats.time_in_state),
                        GFP_KERNEL);
        if (!devfreq->stats.time_in_state) {
                        sizeof(*devfreq->stats.time_in_state),
                        GFP_KERNEL);
        if (!devfreq->stats.time_in_state) {

-@@ -1638,9 +1637,9 @@ static ssize_t available_frequencies_sho
+@@ -1658,9 +1657,9 @@ static ssize_t available_frequencies_sho

  
        mutex_lock(&df->lock);
  
  
        mutex_lock(&df->lock);
  


@@ -168,7 +168,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
  
        mutex_unlock(&df->lock);
        /* Truncate the trailing space */
  
        mutex_unlock(&df->lock);
        /* Truncate the trailing space */

-@@ -1663,7 +1662,7 @@ static ssize_t trans_stat_show(struct de
+@@ -1683,7 +1682,7 @@ static ssize_t trans_stat_show(struct de

  
        if (!df->profile)
                return -EINVAL;
  
        if (!df->profile)
                return -EINVAL;


@@ -176,33 +176,35 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
 +      max_state = df->max_state;
  
        if (max_state == 0)
 +      max_state = df->max_state;
  
        if (max_state == 0)

-               return sprintf(buf, "Not Supported.\n");
-@@ -1680,19 +1679,17 @@ static ssize_t trans_stat_show(struct de
-       len += sprintf(buf + len, "           :");
-       for (i = 0; i < max_state; i++)
-               len += sprintf(buf + len, "%10lu",
--                              df->profile->freq_table[i]);
-+                              df->freq_table[i]);
- 
-       len += sprintf(buf + len, "   time(ms)\n");
- 
+               return scnprintf(buf, PAGE_SIZE, "Not Supported.\n");
+@@ -1702,7 +1701,7 @@ static ssize_t trans_stat_show(struct de
+               if (len >= PAGE_SIZE - 1)
+                       break;
+               len += scnprintf(buf + len, PAGE_SIZE - len, "%10lu",
+-                               df->profile->freq_table[i]);
++                               df->freq_table[i]);
+       }
+       if (len >= PAGE_SIZE - 1)
+               return PAGE_SIZE - 1;
+@@ -1712,7 +1711,7 @@ static ssize_t trans_stat_show(struct de

        for (i = 0; i < max_state; i++) {
        for (i = 0; i < max_state; i++) {

+               if (len >= PAGE_SIZE - 1)
+                       break;

 -              if (df->profile->freq_table[i]
 -              if (df->profile->freq_table[i]

--                                      == df->previous_freq) {
-+              if (df->freq_table[i] == df->previous_freq)
-                       len += sprintf(buf + len, "*");
--              } else {
-+              else
-                       len += sprintf(buf + len, " ");
--              }
--              len += sprintf(buf + len, "%10lu:",
--                              df->profile->freq_table[i]);
-+
-+              len += sprintf(buf + len, "%10lu:", df->freq_table[i]);
-               for (j = 0; j < max_state; j++)
-                       len += sprintf(buf + len, "%10u",
-                               df->stats.trans_table[(i * max_state) + j]);
-@@ -1716,7 +1713,7 @@ static ssize_t trans_stat_store(struct d
++              if (df->freq_table[i]
+                                       == df->previous_freq) {
+                       len += scnprintf(buf + len, PAGE_SIZE - len, "*");
+               } else {
+@@ -1722,7 +1721,7 @@ static ssize_t trans_stat_show(struct de
+                       break;
+ 
+               len += scnprintf(buf + len, PAGE_SIZE - len, "%10lu:",
+-                               df->profile->freq_table[i]);
++                               df->freq_table[i]);
+               for (j = 0; j < max_state; j++) {
+                       if (len >= PAGE_SIZE - 1)
+                               break;
+@@ -1757,7 +1756,7 @@ static ssize_t trans_stat_store(struct d

        if (!df->profile)
                return -EINVAL;
  
        if (!df->profile)
                return -EINVAL;
  


@@ -211,7 +213,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
                return count;
  
        err = kstrtoint(buf, 10, &value);
                return count;
  
        err = kstrtoint(buf, 10, &value);

-@@ -1724,11 +1721,11 @@ static ssize_t trans_stat_store(struct d
+@@ -1765,11 +1764,11 @@ static ssize_t trans_stat_store(struct d

                return -EINVAL;
  
        mutex_lock(&df->lock);
                return -EINVAL;
  
        mutex_lock(&df->lock);

diff --git a/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch b/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch
index cfdef8d6c54927eef03eb543a8a59e805b4a4c4a..a0d173ebf80bb3408c42910b4169df3c51bffc38 100644 (file)
--- a/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch
+++ b/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch
@@ -14,7 +14,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
 
 --- a/drivers/devfreq/devfreq.c
 +++ b/drivers/devfreq/devfreq.c
 
 --- a/drivers/devfreq/devfreq.c
 +++ b/drivers/devfreq/devfreq.c

-@@ -931,8 +931,9 @@ struct devfreq *devfreq_add_device(struc
+@@ -951,8 +951,9 @@ struct devfreq *devfreq_add_device(struc

        err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START,
                                                NULL);
        if (err) {
        err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START,
                                                NULL);
        if (err) {

diff --git a/target/linux/ipq806x/patches-5.15/700-Revert-net-stmmac-Use-hrtimer-for-TX-coalescing.patch b/target/linux/ipq806x/patches-5.15/700-Revert-net-stmmac-Use-hrtimer-for-TX-coalescing.patch
index 384f32a65c961b8990cdc73643fd3a763bc714e5..f2b7ed44531688d0a4465635c7f657cda68ae629 100644 (file)
--- a/target/linux/ipq806x/patches-5.15/700-Revert-net-stmmac-Use-hrtimer-for-TX-coalescing.patch
+++ b/target/linux/ipq806x/patches-5.15/700-Revert-net-stmmac-Use-hrtimer-for-TX-coalescing.patch
@@ -144,7 +144,7 @@ Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
  
        stmmac_hw_teardown(dev);
  init_error:
  
        stmmac_hw_teardown(dev);
  init_error:

-@@ -7498,7 +7490,7 @@ int stmmac_suspend(struct device *dev)
+@@ -7501,7 +7493,7 @@ int stmmac_suspend(struct device *dev)

        stmmac_disable_all_queues(priv);
  
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
        stmmac_disable_all_queues(priv);
  
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)

diff --git a/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch b/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
index 46e92a92f31354a3d22410f9a507a3da803925f4..2741aa5bd6ff04d10b7ecec45f23b75e7308914e 100644 (file)
--- a/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
+++ b/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
@@ -237,7 +237,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
        priv->adap.algo = &hix5hd2_i2c_algorithm;
 --- a/drivers/i2c/busses/i2c-i801.c
 +++ b/drivers/i2c/busses/i2c-i801.c
        priv->adap.algo = &hix5hd2_i2c_algorithm;
 --- a/drivers/i2c/busses/i2c-i801.c
 +++ b/drivers/i2c/busses/i2c-i801.c

-@@ -1110,7 +1110,7 @@ static void dmi_check_onboard_device(u8
+@@ -1103,7 +1103,7 @@ static void dmi_check_onboard_device(u8

  
                memset(&info, 0, sizeof(struct i2c_board_info));
                info.addr = dmi_devices[i].i2c_addr;
  
                memset(&info, 0, sizeof(struct i2c_board_info));
                info.addr = dmi_devices[i].i2c_addr;


@@ -246,7 +246,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
                i2c_new_client_device(adap, &info);
                break;
        }
                i2c_new_client_device(adap, &info);
                break;
        }

-@@ -1266,7 +1266,7 @@ static void register_dell_lis3lv02d_i2c_
+@@ -1259,7 +1259,7 @@ static void register_dell_lis3lv02d_i2c_

  
        memset(&info, 0, sizeof(struct i2c_board_info));
        info.addr = dell_lis3lv02d_devices[i].i2c_addr;
  
        memset(&info, 0, sizeof(struct i2c_board_info));
        info.addr = dell_lis3lv02d_devices[i].i2c_addr;

diff --git a/target/linux/mvebu/patches-5.15/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch b/target/linux/mvebu/patches-5.15/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
index 0e546b426edd0dfc59d3082514db5ad71063bf80..97ac702d4b2c44c5c8cbc1abff9ba1dccaf29bc2 100644 (file)
--- a/target/linux/mvebu/patches-5.15/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
+++ b/target/linux/mvebu/patches-5.15/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
@@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
 
 --- a/drivers/mfd/Kconfig
 +++ b/drivers/mfd/Kconfig
 
 --- a/drivers/mfd/Kconfig
 +++ b/drivers/mfd/Kconfig

-@@ -2189,6 +2189,15 @@ config SGI_MFD_IOC3
+@@ -2190,6 +2190,15 @@ config SGI_MFD_IOC3

          If you have an SGI Origin, Octane, or a PCI IOC3 card,
          then say Y. Otherwise say N.
  
          If you have an SGI Origin, Octane, or a PCI IOC3 card,
          then say Y. Otherwise say N.
  

diff --git a/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
index 6dd02bed54a5ceb11608cf3081162da84edcb02f..bb2dbeb4f8a16ac0c9b5aabd2281a7ccaaeab0a6 100644 (file)
--- a/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
+++ b/target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
@@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
  #include <linux/platform_data/x86/apple.h>
  #include <linux/pm_runtime.h>
  #include <linux/suspend.h>
  #include <linux/platform_data/x86/apple.h>
  #include <linux/pm_runtime.h>
  #include <linux/suspend.h>

-@@ -5883,3 +5884,34 @@ static void nvidia_ion_ahci_fixup(struct
+@@ -5899,3 +5900,34 @@ static void nvidia_ion_ahci_fixup(struct

        pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
  }
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
        pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
  }
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);