kernel: bump 6.1 to 6.1.96
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.96 Manually rebased: generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/net/phy/mxl-gpy.c?h=v6.1.96&id=5bd1b7ab6ae5799c136e4319d8644c5ff9c71757 generic: Fix spelling in dmesg output during boot when using the fitblk driver. generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch All other patches automatically rebased. Build system: Kirkwood bcm53xx Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com>
This commit is contained in:
committed by
Hauke Mehrtens
parent
18f04617f4
commit
93cb81cf2b
@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
/* SGMII */
|
||||
#define VSPEC1_SGMII_CTRL 0x08
|
||||
#define VSPEC1_SGMII_CTRL_ANEN BIT(12) /* Aneg enable */
|
||||
@@ -241,6 +248,35 @@ out:
|
||||
@@ -258,10 +265,39 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -90,15 +90,8 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
+
|
||||
static int gpy_config_init(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
@@ -252,7 +288,10 @@ static int gpy_config_init(struct phy_de
|
||||
|
||||
/* Clear all pending interrupts */
|
||||
ret = phy_read(phydev, PHY_ISTAT);
|
||||
- return ret < 0 ? ret : 0;
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
/* Nothing to configure. Configuration Requirement Placeholder */
|
||||
- return 0;
|
||||
+ return gpy_led_write(phydev);
|
||||
}
|
||||
|
||||
|
||||
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/core/sock.c
|
||||
+++ b/net/core/sock.c
|
||||
@@ -4115,6 +4115,8 @@ static __net_initdata struct pernet_oper
|
||||
@@ -4118,6 +4118,8 @@ static __net_initdata struct pernet_oper
|
||||
|
||||
static int __init proto_init(void)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user