kernel: bump 5.10 to 5.10.158
authorJohn Audia <therealgraysky@proton.me>
Thu, 8 Dec 2022 13:49:33 +0000 (08:49 -0500)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 11 Dec 2022 01:43:28 +0000 (02:43 +0100)
All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
include/kernel-5.10
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/410-block-fit-partition-parser.patch
target/linux/generic/pending-5.10/630-packet_socket_type.patch
target/linux/generic/pending-5.10/703-phy-add-detach-callback-to-struct-phy_driver.patch
target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch

index 816fdd6d49830b794f75e926c53908af94d9a8ed..b7179b8567e9cdebbce46baccf24319c0a75c686 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .157
-LINUX_KERNEL_HASH-5.10.157 = fc4cd7c0777ed53f1350e73877e9918df3c40d8e8abe93c6e1a0eb21556d327f
+LINUX_VERSION-5.10 = .158
+LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
index 93148c97c083e6f59357860098374cd8c78af118..83aae57d280c7d009931e88ae584984f84c57d46 100644 (file)
@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int irq;
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5000,7 +5000,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5008,7 +5008,7 @@ int stmmac_dvr_probe(struct device *devi
        priv->wol_irq = res->wol_irq;
        priv->lpi_irq = res->lpi_irq;
  
index 405cc9d0d439226adc3608564fe9243eedd5e86e..acad393906a8b235199d10105de1d8689d24de85 100644 (file)
@@ -101,7 +101,7 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
  #ifdef CONFIG_SGI_PARTITION
        sgi_partition,
  #endif
-@@ -694,6 +701,14 @@ static bool blk_add_partition(struct gen
+@@ -701,6 +708,14 @@ static bool blk_add_partition(struct gen
            (state->parts[p].flags & ADDPART_FLAG_RAID))
                md_autodetect_dev(part_to_dev(part)->devt);
  
index 26fd8bc754191fa0669fe1a4ca369b429016c84f..beff8bda78e14a83ecc0a5f741fbd95fcc4ac722 100644 (file)
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -3330,6 +3332,7 @@ static int packet_create(struct net *net
+@@ -3329,6 +3331,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;
-@@ -3974,6 +3977,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3972,6 +3975,16 @@ packet_setsockopt(struct socket *sock, i
                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;
        }
-@@ -4030,6 +4043,13 @@ static int packet_getsockopt(struct sock
+@@ -4028,6 +4041,13 @@ static int packet_getsockopt(struct sock
        case PACKET_VNET_HDR:
                val = po->has_vnet_hdr;
                break;
index 52350ecccc28b6fbbc0968fd85229e594da48cfd..068ed323a95b736c9bdb9a14adc14beab94d5e42 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1651,6 +1651,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1652,6 +1652,9 @@ void phy_detach(struct phy_device *phyde
        struct module *ndev_owner = NULL;
        struct mii_bus *bus;
  
index 324d42770d15713cf87ba6dda05802f212c03576..64efbd74c5b0173b7ed025e943623a085dfab0f7 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5033,6 +5033,10 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5041,6 +5041,10 @@ int stmmac_dvr_probe(struct device *devi
                        reset_control_reset(priv->plat->stmmac_rst);
        }
  
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        /* Init MAC and get the capabilities */
        ret = stmmac_hw_init(priv);
        if (ret)
-@@ -5247,6 +5251,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -5255,6 +5259,7 @@ int stmmac_dvr_remove(struct device *dev
        phylink_destroy(priv->phylink);
        if (priv->plat->stmmac_rst)
                reset_control_assert(priv->plat->stmmac_rst);