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/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.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/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.15/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.patch b/target/linux/generic/backport-5.15/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.patch index 0c65de5ab8..81108e19c1 100644 --- a/target/linux/generic/backport-5.15/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.patch +++ b/target/linux/generic/backport-5.15/787-v6.1-net-sfp-add-support-for-HALNy-GPON-SFP.patch @@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> linkmode_or(support, support, modes); --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -321,6 +321,15 @@ static void sfp_fixup_ignore_tx_fault(st +@@ -327,6 +327,15 @@ static void sfp_fixup_ignore_tx_fault(st sfp->tx_fault_ignore = true; } @@ -44,7 +44,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id, unsigned long *modes) { -@@ -353,6 +362,10 @@ static const struct sfp_quirk sfp_quirks +@@ -359,6 +368,10 @@ static const struct sfp_quirk sfp_quirks .modes = sfp_quirk_2500basex, .fixup = sfp_fixup_long_startup, }, { @@ -55,7 +55,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd // NRZ in their EEPROM .vendor = "HUAWEI", -@@ -369,16 +382,18 @@ static const struct sfp_quirk sfp_quirks +@@ -375,16 +388,18 @@ static const struct sfp_quirk sfp_quirks .vendor = "UBNT", .part = "UF-INSTANT", .modes = sfp_quirk_ubnt_uf_instant, |