generic: move patch from pending to backport
Move all patch that got merged upstream from pending to backport and add related tag. This is to make it easier to update to kernel 6.12. Patch 680 required some special care as the upstream version had to be split in a series of 6 patch. Referesh all affected patch. Link: https://github.com/openwrt/openwrt/pull/18464 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
@@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
|
||||
--- a/drivers/net/phy/sfp.c
|
||||
+++ b/drivers/net/phy/sfp.c
|
||||
@@ -1570,6 +1570,10 @@ static void sfp_hwmon_probe(struct work_
|
||||
@@ -1571,6 +1571,10 @@ static void sfp_hwmon_probe(struct work_
|
||||
struct sfp *sfp = container_of(work, struct sfp, hwmon_probe.work);
|
||||
int err;
|
||||
|
||||
@@ -21,7 +21,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
/* hwmon interface needs to access 16bit registers in atomic way to
|
||||
* guarantee coherency of the diagnostic monitoring data. If it is not
|
||||
* possible to guarantee coherency because EEPROM is broken in such way
|
||||
@@ -2430,6 +2434,13 @@ static void sfp_sm_module(struct sfp *sf
|
||||
@@ -2433,6 +2437,13 @@ static void sfp_sm_module(struct sfp *sf
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
|
||||
{
|
||||
mdiobus_unregister(sfp->i2c_mii);
|
||||
@@ -1888,9 +1965,15 @@ static void sfp_sm_fault(struct sfp *sfp
|
||||
@@ -1889,9 +1966,15 @@ static void sfp_sm_fault(struct sfp *sfp
|
||||
|
||||
static int sfp_sm_add_mdio_bus(struct sfp *sfp)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user