From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: "Csókás, Bence" <csokas.bence@prolan.hu>,
"Sasha Levin" <sashal@kernel.org>
Subject: Re: [PATCH 6.6 1/3] net: fec: Move `fec_ptp_read()` to the top of the file
Date: Fri, 22 Nov 2024 08:51:44 -0500 [thread overview]
Message-ID: <20241122083920-54de22158a92c75d@stable.kernel.org> (raw)
In-Reply-To: <20241016080156.265251-1-csokas.bence@prolan.hu>
[ 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@prolan.hu>
Commit author: Csókás, Bence <csokas.bence@prolan.hu>
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@nxp.com>
Link: https://lore.kernel.org/netdev/20240805144754.2384663-1-csokas.bence@prolan.hu/T/#ma6c21ad264016c24612048b1483769eaff8cdf20
Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20240812094713.2883476-1-csokas.bence@prolan.hu
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+(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 |
next prev parent reply other threads:[~2024-11-22 13:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 6:41 [REQUEST] net: fec: Not yet ported PTP patches Csókás Bence
2024-10-16 8:01 ` [PATCH 6.6 1/3] net: fec: Move `fec_ptp_read()` to the top of the file Csókás, Bence
2024-11-22 13:51 ` Sasha Levin [this message]
2024-11-22 13:56 ` Csókás Bence
2024-11-23 14:36 ` Sasha Levin
2024-11-24 10:47 ` Csókás Bence
2024-11-24 12:06 ` Sasha Levin
2024-10-16 8:01 ` [PATCH 6.6 2/3] net: fec: Remove duplicated code Csókás, Bence
2024-10-16 8:01 ` [PATCH 6.6 3/3] net: fec: refactor PPS channel configuration Csókás, Bence
2024-10-18 10:37 ` Greg Kroah-Hartman
2024-11-22 9:10 ` Csókás Bence
2024-11-22 11:04 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241122083920-54de22158a92c75d@stable.kernel.org \
--to=sashal@kernel.org \
--cc=csokas.bence@prolan.hu \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.