diff options
author | John Audia <graysky@archlinux.us> | 2022-02-16 09:46:00 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-01 21:38:36 +0100 |
commit | a2d4b5711aa73d14ffbc4f90a7944473b80baecb (patch) | |
tree | a5a8e558eaa6ea6a93cfec89362b6ed9cb5b1dd1 /target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch | |
parent | 02e42f0650a64f29e8e21f7ba0a8ceb366463585 (diff) | |
download | upstream-a2d4b5711aa73d14ffbc4f90a7944473b80baecb.tar.gz upstream-a2d4b5711aa73d14ffbc4f90a7944473b80baecb.tar.bz2 upstream-a2d4b5711aa73d14ffbc4f90a7944473b80baecb.zip |
kernel: bump 5.10 to 5.10.101
Removed upstreamed:
pending-5.10/841-USB-serial-option-add-ZTE-MF286D-modem.patch[1]
bcm27xx/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=7113440a36c741efd7c76e3d70b3634100120cdb
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=21c890ca8eaecea06cabb92be2a53a6f26f56383
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch b/target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch index 3e01e727e1..b86e9bf640 100644 --- a/target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch +++ b/target/linux/generic/backport-5.10/713-v5.15-net-phy-marvell-add-SFP-support-for-88E1510.patch @@ -49,7 +49,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> #define MII_88E1510_GEN_CTRL_REG_1_RESET 0x8000 /* Soft reset */ #define MII_VCT5_TX_RX_MDI0_COUPLING 0x10 -@@ -2504,6 +2513,100 @@ static int marvell_probe(struct phy_devi +@@ -2505,6 +2514,100 @@ static int marvell_probe(struct phy_devi return marvell_hwmon_probe(phydev); } @@ -150,7 +150,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static struct phy_driver marvell_drivers[] = { { .phy_id = MARVELL_PHY_ID_88E1101, -@@ -2710,7 +2813,7 @@ static struct phy_driver marvell_drivers +@@ -2711,7 +2814,7 @@ static struct phy_driver marvell_drivers .driver_data = DEF_MARVELL_HWMON_OPS(m88e1510_hwmon_ops), .features = PHY_GBIT_FIBRE_FEATURES, .flags = PHY_POLL_CABLE_TEST, |