kernel: bump 5.10 to 5.10.134
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							56760c0b13
						
					
				
				
					commit
					7be62b1187
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.10 = .133 | LINUX_VERSION-5.10 = .134 | ||||||
| LINUX_KERNEL_HASH-5.10.133 = 3b5c4c7d5bca720c11f1024c9aa00ac04397b6c7de37fd4170444077c723280e | LINUX_KERNEL_HASH-5.10.134 = ec3513acdf033dd8f8ac2545cd1bb826b0669e151185e5f70408a5c9fe273269 | ||||||
|   | |||||||
| @@ -706,7 +706,7 @@ | |||||||
|  EXPORT_SYMBOL(xfrm_parse_spi); |  EXPORT_SYMBOL(xfrm_parse_spi); | ||||||
| --- a/net/ipv4/tcp_input.c | --- a/net/ipv4/tcp_input.c | ||||||
| +++ b/net/ipv4/tcp_input.c | +++ b/net/ipv4/tcp_input.c | ||||||
| @@ -4087,14 +4087,16 @@ static bool tcp_parse_aligned_timestamp( | @@ -4092,14 +4092,16 @@ static bool tcp_parse_aligned_timestamp( | ||||||
|  { |  { | ||||||
|  	const __be32 *ptr = (const __be32 *)(th + 1); |  	const __be32 *ptr = (const __be32 *)(th + 1); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -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 | ||||||
| @@ -4988,7 +4988,7 @@ int stmmac_dvr_probe(struct device *devi | @@ -4987,7 +4987,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; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
|  struct rtnl_link { |  struct rtnl_link { | ||||||
|  	rtnl_doit_func		doit; |  	rtnl_doit_func		doit; | ||||||
| @@ -4695,7 +4695,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu | @@ -4684,7 +4684,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu | ||||||
|  	    brport_nla_put_flag(skb, flags, mask, |  	    brport_nla_put_flag(skb, flags, mask, | ||||||
|  				IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) || |  				IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) || | ||||||
|  	    brport_nla_put_flag(skb, flags, mask, |  	    brport_nla_put_flag(skb, flags, mask, | ||||||
|   | |||||||
| @@ -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 | ||||||
| @@ -5021,6 +5021,10 @@ int stmmac_dvr_probe(struct device *devi | @@ -5020,6 +5020,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) | ||||||
| @@ -5245,6 +5249,7 @@ int stmmac_dvr_remove(struct device *dev | @@ -5244,6 +5248,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); | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | --- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | ||||||
| +++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | +++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | ||||||
| @@ -354,7 +354,7 @@ static int rt2880_pinmux_probe(struct pl | @@ -356,7 +356,7 @@ static int rt2880_pinmux_probe(struct pl | ||||||
|  		if (!of_device_is_available(np)) |  		if (!of_device_is_available(np)) | ||||||
|  			continue; |  			continue; | ||||||
|   |   | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user