diff options
| author | John Audia <therealgraysky@proton.me> | 2023-04-20 08:53:12 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-22 01:10:24 +0200 |
| commit | 3887a55909aa26c3366fd0206772280da850ab16 (patch) | |
| tree | debbd1c9b68ffd77c114398b756f19a66255fad2 /target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch | |
| parent | 28ce677fa7402a2d59033012a76cbfa1b4b9b868 (diff) | |
| download | upstream-3887a55909aa26c3366fd0206772280da850ab16.tar.gz upstream-3887a55909aa26c3366fd0206772280da850ab16.tar.bz2 upstream-3887a55909aa26c3366fd0206772280da850ab16.zip | |
kernel: bump 5.15 to 5.15.108
Removed upstreamed:
backport-5.15/430-v6.3-ubi-Fix-failure-attaching-when-vid_hdr-offset-equals.patch[1]
backport-5.15/612-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.108&id=85d7a7044b759d865d10395a357632af00de5867
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.108&id=906a6689bb0191ad2a44131a3377006aa098af59
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch b/target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch index e5f8031636..02fa28c5af 100644 --- a/target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch +++ b/target/linux/generic/backport-5.15/784-v6.1-net-sfp-move-quirk-handling-into-sfp.c.patch @@ -142,7 +142,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> ret = ops->module_insert(bus->upstream, id); --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -253,6 +253,8 @@ struct sfp { +@@ -259,6 +259,8 @@ struct sfp { unsigned int module_t_start_up; bool tx_fault_ignore; @@ -151,7 +151,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> #if IS_ENABLED(CONFIG_HWMON) struct sfp_diag diag; struct delayed_work hwmon_probe; -@@ -309,6 +311,93 @@ static const struct of_device_id sfp_of_ +@@ -315,6 +317,93 @@ static const struct of_device_id sfp_of_ }; MODULE_DEVICE_TABLE(of, sfp_of_match); @@ -245,7 +245,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static unsigned long poll_jiffies; static unsigned int sfp_gpio_get_state(struct sfp *sfp) -@@ -1964,6 +2053,8 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -1966,6 +2055,8 @@ static int sfp_sm_mod_probe(struct sfp * else sfp->tx_fault_ignore = false; @@ -254,7 +254,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> return 0; } -@@ -2075,7 +2166,8 @@ static void sfp_sm_module(struct sfp *sf +@@ -2077,7 +2168,8 @@ static void sfp_sm_module(struct sfp *sf break; /* Report the module insertion to the upstream device */ |