[ Sasha's backport helper bot ] Hi, Found matching upstream commit: 4374a1fe580a14f6152752390c678d90311df247 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: Csókás, Bence <csokas.bence@xxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (different SHA1: 97f35652e0e8) 6.6.y | Present (different SHA1: 1e1eb62c40e1) Note: The patch differs from the upstream commit: --- --- - 2024-11-22 08:39:00.262357742 -0500 +++ /tmp/tmp.2jyCFuEVB2 2024-11-22 08:39:00.254181034 -0500 @@ -1,19 +1,16 @@ -This function is used in `fec_ptp_enable_pps()` through -struct cyclecounter read(). Moving the declaration makes -it clearer, what's happening. - Suggested-by: Frank Li <Frank.li@xxxxxxx> Link: https://lore.kernel.org/netdev/20240805144754.2384663-1-csokas.bence@xxxxxxxxx/T/#ma6c21ad264016c24612048b1483769eaff8cdf20 Signed-off-by: Csókás, Bence <csokas.bence@xxxxxxxxx> Reviewed-by: Andrew Lunn <andrew@xxxxxxx> Link: https://patch.msgid.link/20240812094713.2883476-1-csokas.bence@xxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> +(cherry picked from commit 4374a1fe580a14f6152752390c678d90311df247) --- drivers/net/ethernet/freescale/fec_ptp.c | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c -index 2e4f3e1782a25..7f4ccd1ade5b1 100644 +index 2e4f3e1782a2..7f4ccd1ade5b 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -90,6 +90,30 @@ @@ -87,3 +84,7 @@ /** * fec_ptp_start_cyclecounter - create the cycle counter from hw * @ndev: network device +-- +2.34.1 + + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Failed | N/A | | stable/linux-6.1.y | Failed | N/A |
