| Message ID | 20210708180408.3930614-1-jonathan.lemon@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net] ptp: Relocate lookup cookie to correct block. | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 8 Jul 2021 11:04:08 -0700 you wrote: > An earlier commit set the pps_lookup cookie, but the line > was somehow added to the wrong code block. Correct this. > > Fixes: 8602e40fc813 ("ptp: Set lookup cookie when creating a PTP PPS source.") > Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> > Signed-off-by: Dario Binacchi <dariobin@libero.it> > Acked-by: Richard Cochran <richardcochran@gmail.com> > > [...] Here is the summary with links: - [net] ptp: Relocate lookup cookie to correct block. https://git.kernel.org/netdev/net/c/debdd8e31895 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Hi Jonathan, IMHO it is unfair that I am not the commit author of this patch. Thanks and regards, Dario > Il 08/07/2021 20:04 Jonathan Lemon <jonathan.lemon@gmail.com> ha scritto: > > > An earlier commit set the pps_lookup cookie, but the line > was somehow added to the wrong code block. Correct this. > > Fixes: 8602e40fc813 ("ptp: Set lookup cookie when creating a PTP PPS source.") > Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> > Signed-off-by: Dario Binacchi <dariobin@libero.it> > Acked-by: Richard Cochran <richardcochran@gmail.com> > --- > drivers/ptp/ptp_clock.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c > index ce6d9fc85607..4dfc52e06704 100644 > --- a/drivers/ptp/ptp_clock.c > +++ b/drivers/ptp/ptp_clock.c > @@ -232,7 +232,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, > pr_err("failed to create ptp aux_worker %d\n", err); > goto kworker_err; > } > - ptp->pps_source->lookup_cookie = ptp; > } > > /* PTP virtual clock is being registered under physical clock */ > @@ -268,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, > pr_err("failed to register pps source\n"); > goto no_pps; > } > + ptp->pps_source->lookup_cookie = ptp; > } > > /* Initialize a new device of our class in our clock structure. */ > -- > 2.30.2
On Sat, Jul 10, 2021 at 03:13:17PM +0200, dariobin@libero.it wrote: > Hi Jonathan, > IMHO it is unfair that I am not the commit author of this patch. Richard alerted me to the error, and I sent a fix on July 6th when I came back from vacation. I saw your fix go by 2 days later - which was also for net-next, and tossed as well. So when I respun my initial patch against -net, I added your signoff, since the two patches were identical. No slight intended... -- Jonathan
> Il 10/07/2021 18:56 Jonathan Lemon <jonathan.lemon@gmail.com> ha scritto: > > > On Sat, Jul 10, 2021 at 03:13:17PM +0200, dariobin@libero.it wrote: > > Hi Jonathan, > > IMHO it is unfair that I am not the commit author of this patch. > > Richard alerted me to the error, and I sent a fix on July 6th when > I came back from vacation. I saw your fix go by 2 days later - which > was also for net-next, and tossed as well. > > So when I respun my initial patch against -net, I added your > signoff, since the two patches were identical. > > No slight intended... Okay, thanks for the clarification, Regards, Dario > -- > Jonathan
On Sat, Jul 10, 2021 at 09:56:30AM -0700, Jonathan Lemon wrote: > On Sat, Jul 10, 2021 at 03:13:17PM +0200, dariobin@libero.it wrote: > > Hi Jonathan, > > IMHO it is unfair that I am not the commit author of this patch. > > Richard alerted me to the error, and I sent a fix on July 6th when > I came back from vacation. I saw your fix go by 2 days later - which > was also for net-next, and tossed as well. Vladimir Oltean found the bug (too). He deserves credit for that! Thanks, Richard
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c index ce6d9fc85607..4dfc52e06704 100644 --- a/drivers/ptp/ptp_clock.c +++ b/drivers/ptp/ptp_clock.c @@ -232,7 +232,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, pr_err("failed to create ptp aux_worker %d\n", err); goto kworker_err; } - ptp->pps_source->lookup_cookie = ptp; } /* PTP virtual clock is being registered under physical clock */ @@ -268,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, pr_err("failed to register pps source\n"); goto no_pps; } + ptp->pps_source->lookup_cookie = ptp; } /* Initialize a new device of our class in our clock structure. */
An earlier commit set the pps_lookup cookie, but the line was somehow added to the wrong code block. Correct this. Fixes: 8602e40fc813 ("ptp: Set lookup cookie when creating a PTP PPS source.") Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by: Dario Binacchi <dariobin@libero.it> Acked-by: Richard Cochran <richardcochran@gmail.com> --- drivers/ptp/ptp_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)