[ Sasha's backport helper bot ] Hi, Found matching upstream commit: 566c2d83887f0570056833102adc5b88e681b0c7 WARNING: Author mismatch between patch and found commit: Backport author: =?UTF-8?q?Cs=C3=B3k=C3=A1s=2C=20Bence?= <csokas.bence@xxxxxxxxx> Commit author: Francesco Dolcini <francesco.dolcini@xxxxxxxxxxx> Status in newer kernel trees: 6.12.y | Not found 6.11.y | Not found 6.6.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-25 09:25:02.822819093 -0500 +++ /tmp/tmp.NUygUEJTBz 2024-11-25 09:25:02.816734590 -0500 @@ -10,12 +10,15 @@ Signed-off-by: Francesco Dolcini <francesco.dolcini@xxxxxxxxxxx> Reviewed-by: Csókás, Bence <csokas.bence@xxxxxxxxx> Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx> + +(cherry picked from commit 566c2d83887f0570056833102adc5b88e681b0c7) +Signed-off-by: Csókás, Bence <csokas.bence@xxxxxxxxx> --- drivers/net/ethernet/freescale/fec_ptp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c -index 37e1c895f1b86..7f6b574320716 100644 +index 37e1c895f1b8..7f6b57432071 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -523,8 +523,6 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, @@ -44,3 +47,7 @@ fep->ptp_caps.max_adj = 250000000; fep->ptp_caps.n_alarm = 0; fep->ptp_caps.n_ext_ts = 0; +-- +2.34.1 + + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |
