kernel: bump 5.10 to 5.10.156
authorJohn Audia <therealgraysky@proton.me>
Fri, 25 Nov 2022 21:10:45 +0000 (16:10 -0500)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 27 Nov 2022 14:43:08 +0000 (15:43 +0100)
Manually rebased: ath79/patches-5.10/910-unaligned_access_hacks.patch

All other patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit acb10faa35748ca3a7e0f559c431a1a752fdc529)

include/kernel-5.10
target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
target/linux/bcm27xx/patches-5.10/950-0006-smsx95xx-fix-crimes-against-truesize.patch
target/linux/bcm27xx/patches-5.10/950-0007-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
target/linux/bcm27xx/patches-5.10/950-0008-Allow-mac-address-to-be-set-in-smsc95xx.patch
target/linux/bcm27xx/patches-5.10/950-0046-MMC-added-alternative-MMC-driver.patch
target/linux/bcm27xx/patches-5.10/950-0650-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch
target/linux/x86/patches-5.10/101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch

index dec15dddaa68acba4ff59c1e61404fd6bdbbc43c..16040014ff125fd73ba54ef439e72ef5616b9fd7 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .155
-LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3
+LINUX_VERSION-5.10 = .156
+LINUX_KERNEL_HASH-5.10.156 = 679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923
index 035a79fb2eec54a8bbba65fe2f4b188c73b6b39c..d725333f68a9843503f246e66ee78d082f758519 100644 (file)
  
 --- a/include/uapi/linux/ip.h
 +++ b/include/uapi/linux/ip.h
-@@ -103,7 +103,7 @@ struct iphdr {
-       __be32  saddr;
-       __be32  daddr;
+@@ -105,7 +105,7 @@ struct iphdr {
+               __be32  daddr;
+       );
        /*The options start here. */
 -};
 +} __attribute__((packed, aligned(2)));
  struct ip_auth_hdr {
 --- a/include/uapi/linux/ipv6.h
 +++ b/include/uapi/linux/ipv6.h
-@@ -132,7 +132,7 @@ struct ipv6hdr {
-       struct  in6_addr        saddr;
-       struct  in6_addr        daddr;
+@@ -134,7 +134,7 @@ struct ipv6hdr {
+               struct  in6_addr        saddr;
+               struct  in6_addr        daddr;
+       );
 -};
 +} __attribute__((packed, aligned(2)));
  
index 9db380f6558befc74eea17026ab2839b469fe1b1..659f06dfa23132a7b8276d07323158a38b190b94 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
 
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -67,6 +67,10 @@ static bool turbo_mode = true;
+@@ -68,6 +68,10 @@ static bool turbo_mode = true;
  module_param(turbo_mode, bool, 0644);
  MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
  
@@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
                                            u32 *data, int in_pm)
  {
-@@ -1838,7 +1842,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1853,7 +1857,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 */
@@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
  
                                return 1;
                        }
-@@ -1856,7 +1861,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1871,7 +1876,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 */
index a5e78bd32633670aa19a518cfffe9bcb09fc7a0f..125e62492727cfa282162caa8da74ef45ffc7b41 100644 (file)
@@ -11,7 +11,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
 
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -71,6 +71,10 @@ static bool truesize_mode = false;
+@@ -72,6 +72,10 @@ static bool truesize_mode = false;
  module_param(truesize_mode, bool, 0644);
  MODULE_PARM_DESC(truesize_mode, "Report larger truesize value");
  
@@ -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, int in_pm)
  {
-@@ -915,13 +919,13 @@ static int smsc95xx_reset(struct usbnet
+@@ -918,13 +922,13 @@ static int smsc95xx_reset(struct usbnet
  
        if (!turbo_mode) {
                burst_cap = 0;
index e465d90f3f93b4ed82f3bd7805ece2efce11469d..75fb4260da0819407c970ebb3f08ac22f5c8c6f8 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  
  struct smsc95xx_priv {
        u32 mac_cr;
-@@ -75,6 +76,10 @@ static int packetsize = 2560;
+@@ -76,6 +77,10 @@ static int packetsize = 2560;
  module_param(packetsize, int, 0644);
  MODULE_PARM_DESC(packetsize, "Override the RX URB packet size");
  
@@ -29,7 +29,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
                                            u32 *data, int in_pm)
  {
-@@ -771,6 +776,53 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -774,6 +779,53 @@ static int smsc95xx_ioctl(struct net_dev
        return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
@@ -83,7 +83,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  static void smsc95xx_init_mac_address(struct usbnet *dev)
  {
        /* maybe the boot loader passed the MAC address in devicetree */
-@@ -793,6 +845,10 @@ static void smsc95xx_init_mac_address(st
+@@ -796,6 +848,10 @@ static void smsc95xx_init_mac_address(st
                }
        }
  
index cc56cff24f45aef53c6774f4021fe863f76e5af2..590a19c3a250ded242756df69b259db74a01fa10 100644 (file)
@@ -266,7 +266,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
                goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -1874,7 +1874,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -1880,7 +1880,8 @@ EXPORT_SYMBOL(mmc_erase);
  
  int mmc_can_erase(struct mmc_card *card)
  {
index 3b8496cd9537230ca42b1739ab13ff497dd364d5..2e62f190e5ec718a0a3cbe7a236f47ba0d637fbc 100644 (file)
@@ -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,
-@@ -4078,6 +4110,9 @@ static const struct of_device_id platfor
+@@ -4080,6 +4112,9 @@ static const struct of_device_id platfor
                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {
index 3c559938fe37146a2753652c5cd431750ecac583..80ba4a69c1397dd1ab19ac6c9a9ceb4ec7d36863 100644 (file)
@@ -311,7 +311,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        arc_emac_set_address_internal(ndev);
 --- a/drivers/net/ethernet/atheros/ag71xx.c
 +++ b/drivers/net/ethernet/atheros/ag71xx.c
-@@ -1856,7 +1856,6 @@ static int ag71xx_probe(struct platform_
+@@ -1857,7 +1857,6 @@ static int ag71xx_probe(struct platform_
        const struct ag71xx_dcfg *dcfg;
        struct net_device *ndev;
        struct resource *res;
@@ -319,7 +319,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int tx_size, err, i;
        struct ag71xx *ag;
  
-@@ -1952,10 +1951,8 @@ static int ag71xx_probe(struct platform_
+@@ -1953,10 +1952,8 @@ static int ag71xx_probe(struct platform_
        ag->stop_desc->ctrl = 0;
        ag->stop_desc->next = (u32)ag->stop_desc_dma;
  
index 6940c47f3d0bd462be3942116075eadb3bbb6310..a7f74e7c9af149fa6f33920ce944a7783e646f42 100644 (file)
@@ -10,8 +10,8 @@
        {QMI_FIXED_INTF(0x0408, 0xea42, 4)},    /* Yota / Megafon M100-1 */
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -243,6 +243,8 @@ static void option_instat_callback(struc
- #define UBLOX_PRODUCT_R6XX                    0x90fa
+@@ -244,6 +244,8 @@ static void option_instat_callback(struc
+ #define UBLOX_PRODUCT_R410M                   0x90b2
  /* These Yuga products use Qualcomm's vendor ID */
  #define YUGA_PRODUCT_CLM920_NC5                       0x9625
 +/* These MeigLink products use Qualcomm's vendor ID */
@@ -19,7 +19,7 @@
  
  #define QUECTEL_VENDOR_ID                     0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1143,6 +1145,11 @@ static const struct usb_device_id option
+@@ -1155,6 +1157,11 @@ static const struct usb_device_id option
          .driver_info = ZLP },
        { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
          .driver_info = RSVD(4) },
index 11f4d6ca8b6c9e0bec7b903645c6ca8f831a360f..7740963b8db2a8149a993620477d4bd7cf682b17 100644 (file)
@@ -19,7 +19,7 @@
        },
        [PORT_NPCM] = {
                .name           = "Nuvoton 16550",
-@@ -2724,6 +2724,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2713,6 +2713,11 @@ serial8250_do_set_termios(struct uart_po
        unsigned long flags;
        unsigned int baud, quot, frac = 0;
  
index b4881bf1d3acda1859197a908ab7e8b3f80ad28b..a5bd2459ab3bef09b4306696c621d7e189ea916a 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Lee Jones <lee.jones@linaro.org>
 
 --- a/drivers/mfd/lpc_ich.c
 +++ b/drivers/mfd/lpc_ich.c
-@@ -489,6 +489,7 @@ static struct lpc_ich_info lpc_chipset_i
+@@ -491,6 +491,7 @@ static struct lpc_ich_info lpc_chipset_i
        [LPC_DH89XXCC] = {
                .name = "DH89xxCC",
                .iTCO_version = 2,