Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 28, 2025

In the bgpd module, the TP_ARGS macro was causing a compilation error due to an incorrect argument type for bgp. This commit updates the macro to use struct bgp * instead of bgp, resolving the issue.

No issue related.


This is an automatic backport of pull request #19266 done by Mergify.

Signed-off-by: zrf <853241825@qq.com>
(cherry picked from commit 80d5440)

# Conflicts:
#	bgpd/bgp_trace.h
@mergify mergify bot added the conflicts label Jul 28, 2025
Copy link
Author

mergify bot commented Jul 28, 2025

Cherry-pick of 80d5440 has failed:

On branch mergify/bp/stable/10.2/pr-19266
Your branch is up to date with 'origin/stable/10.2'.

You are currently cherry-picking commit 80d54406f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgp_trace.h

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@frrbot frrbot bot added the bgp label Jul 28, 2025
@ton31337 ton31337 closed this Jul 28, 2025
@ton31337 ton31337 deleted the mergify/bp/stable/10.2/pr-19266 branch July 28, 2025 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants