kernel: bump 5.10 to 5.10.158
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
		
				
					committed by
					
						
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			
						parent
						
							7b7d8fe60d
						
					
				
				
					commit
					6801c460b6
				
			@@ -1,2 +1,2 @@
 | 
				
			|||||||
LINUX_VERSION-5.10 = .157
 | 
					LINUX_VERSION-5.10 = .158
 | 
				
			||||||
LINUX_KERNEL_HASH-5.10.157 = fc4cd7c0777ed53f1350e73877e9918df3c40d8e8abe93c6e1a0eb21556d327f
 | 
					LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 | 
				
			|||||||
 	int irq;
 | 
					 	int irq;
 | 
				
			||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 | 
					--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 | 
				
			||||||
+++ b/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->wol_irq = res->wol_irq;
 | 
				
			||||||
 	priv->lpi_irq = res->lpi_irq;
 | 
					 	priv->lpi_irq = res->lpi_irq;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -101,7 +101,7 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
 | 
				
			|||||||
 #ifdef CONFIG_SGI_PARTITION
 | 
					 #ifdef CONFIG_SGI_PARTITION
 | 
				
			||||||
 	sgi_partition,
 | 
					 	sgi_partition,
 | 
				
			||||||
 #endif
 | 
					 #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))
 | 
					 	    (state->parts[p].flags & ADDPART_FLAG_RAID))
 | 
				
			||||||
 		md_autodetect_dev(part_to_dev(part)->devt);
 | 
					 		md_autodetect_dev(part_to_dev(part)->devt);
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
				
			|||||||
 	if (!net_eq(dev_net(dev), sock_net(sk)))
 | 
					 	if (!net_eq(dev_net(dev), sock_net(sk)))
 | 
				
			||||||
 		goto drop;
 | 
					 		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);
 | 
					 	mutex_init(&po->pg_vec_lock);
 | 
				
			||||||
 	po->rollover = NULL;
 | 
					 	po->rollover = NULL;
 | 
				
			||||||
 	po->prot_hook.func = packet_rcv;
 | 
					 	po->prot_hook.func = packet_rcv;
 | 
				
			||||||
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
 	if (sock->type == SOCK_PACKET)
 | 
					 	if (sock->type == SOCK_PACKET)
 | 
				
			||||||
 		po->prot_hook.func = packet_rcv_spkt;
 | 
					 		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;
 | 
					 		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
 | 
				
			||||||
 		return 0;
 | 
					 		return 0;
 | 
				
			||||||
 	}
 | 
					 	}
 | 
				
			||||||
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
				
			|||||||
 	default:
 | 
					 	default:
 | 
				
			||||||
 		return -ENOPROTOOPT;
 | 
					 		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:
 | 
					 	case PACKET_VNET_HDR:
 | 
				
			||||||
 		val = po->has_vnet_hdr;
 | 
					 		val = po->has_vnet_hdr;
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/drivers/net/phy/phy_device.c
 | 
					--- a/drivers/net/phy/phy_device.c
 | 
				
			||||||
+++ b/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 module *ndev_owner = NULL;
 | 
				
			||||||
 	struct mii_bus *bus;
 | 
					 	struct mii_bus *bus;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 | 
					--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 | 
				
			||||||
+++ b/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);
 | 
					 			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 */
 | 
					 	/* Init MAC and get the capabilities */
 | 
				
			||||||
 	ret = stmmac_hw_init(priv);
 | 
					 	ret = stmmac_hw_init(priv);
 | 
				
			||||||
 	if (ret)
 | 
					 	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);
 | 
					 	phylink_destroy(priv->phylink);
 | 
				
			||||||
 	if (priv->plat->stmmac_rst)
 | 
					 	if (priv->plat->stmmac_rst)
 | 
				
			||||||
 		reset_control_assert(priv->plat->stmmac_rst);
 | 
					 		reset_control_assert(priv->plat->stmmac_rst);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user