Skip to contentSkip to conversation

ptp: Relocate lookup cookie to correct block.

PATCH Applied Jonathan Lemon 4 participants 6 messages Jul 8, 2021 – Jul 12, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ptp: Relocate lookup cookie to correct block.

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.")
---
 drivers/ptp/ptp_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +1 -1
index ce6d9fc85607..4dfc52e06704 100644
@@ -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. */
Signature · 1 line
2.30.2
#1 lore raw
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 9 lines · 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.")

[...]

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

#2 lore raw
In reply to Jonathan Lemon

Hi Jonathan,
IMHO it is unfair that I am not the commit author of this patch.

Thanks and regards,
Dario

Quoted 36 lines

Il 08/07/2021 20:04 Jonathan Lemon <[email protected]> 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.")
---
 drivers/ptp/ptp_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +1 -1
index ce6d9fc85607..4dfc52e06704 100644
@@ -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. */
Signature · 1 line
2.30.2
#3 lore raw
Quoted 2 lines · On Sat, Jul 10, 2021 at 03:13:17PM +0200, [email protected] 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...

Signature · 1 line
Jonathan
#4 lore raw
Quoted 8 lines

Il 10/07/2021 18:56 Jonathan Lemon <[email protected]> ha scritto:

Quoted 2 lines · On Sat, Jul 10, 2021 at 03:13:17PM +0200, [email protected] wrote:

Hi Jonathan,
IMHO it is unfair that I am not the commit author of this patch.

Quoted 8 lines

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

Quoted 2 lines
Signature · 1 line
Jonathan
maintainer
#5 lore raw
In reply to Jonathan Lemon
Quoted 7 lines · Jonathan Lemon
Quoted 2 lines · On Sat, Jul 10, 2021 at 03:13:17PM +0200, [email protected] 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