aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-11-28 17:08:16 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-11-29 23:41:33 +0100
commit6c118efc01a65c064934ec41b8108cb45e00c128 (patch)
treebf1b243af4e4c5152c3189fa3126a9723033c711 /target/linux/generic/hack-5.15
parentc20bedf1f59712f6380a8e184b6ca0bb635d22e6 (diff)
downloadupstream-6c118efc01a65c064934ec41b8108cb45e00c128.tar.gz
upstream-6c118efc01a65c064934ec41b8108cb45e00c128.tar.bz2
upstream-6c118efc01a65c064934ec41b8108cb45e00c128.zip
kernel: bump 5.15 to 5.15.140
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.140 Removed upstreamed: mvebu/patches-5.15/106-Revert-i2c-pxa-move-to-generic-GPIO-recovery.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.140&id=06d320ca170b4e59bb261e2ce3ffe84e9154d42b Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-5.15')
-rw-r--r--target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch b/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch
index 33c5c271212..a463bf7c4eb 100644
--- a/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch
+++ b/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static void phylink_mac_pcs_get_state(struct phylink *pl,
struct phylink_link_state *state)
{
-@@ -3014,6 +3013,52 @@ void phylink_mii_c22_pcs_get_state(struc
+@@ -3015,6 +3014,52 @@ void phylink_mii_c22_pcs_get_state(struc
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
/**
@@ -118,7 +118,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS
* advertisement
* @pcs: a pointer to a &struct mdio_device.
-@@ -3085,6 +3130,46 @@ int phylink_mii_c22_pcs_set_advertisemen
+@@ -3086,6 +3131,46 @@ int phylink_mii_c22_pcs_set_advertisemen
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_set_advertisement);
/**