Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Memory type stuff (backport #16711) #16714

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 1, 2024

see individual commits but clean up some MTYPE_XXX stuff that needs to be better


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

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit a556f6e)
When trying to track down a MTYPE_TMP memory leak
it's harder to search for it when you happen to
have some usage of ttable_dump.  Let's just give
it it's own memory type so that we can avoid
confusion in the future.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit d97c535)

# Conflicts:
#	isisd/isis_spf.c
@mergify mergify bot added the conflicts label Sep 1, 2024
Copy link
Author

mergify bot commented Sep 1, 2024

Cherry-pick of d97c535 has failed:

On branch mergify/bp/stable/10.1/pr-16711
Your branch is ahead of 'origin/stable/10.1' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d97c535c1e.
  (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)

Changes to be committed:
	modified:   bgpd/bgp_bmp.c
	modified:   isisd/isis_sr.c
	modified:   isisd/isis_srv6.c
	modified:   lib/hash.c
	modified:   lib/memory.c
	modified:   lib/memory.h
	modified:   lib/northbound_cli.c
	modified:   lib/termtable.c
	modified:   lib/termtable.h
	modified:   pathd/path_cli.c
	modified:   pimd/pim6_mld.c
	modified:   pimd/pim_cmd_common.c
	modified:   pimd/pim_rp.c
	modified:   tests/lib/test_ttable.c
	modified:   vrrpd/vrrp_vty.c
	modified:   zebra/dplane_fpm_nl.c
	modified:   zebra/zebra_mpls.c
	modified:   zebra/zebra_vty.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   isisd/isis_spf.c

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 isis label Sep 1, 2024
@mergify mergify bot mentioned this pull request Sep 1, 2024
@Jafaral Jafaral closed this Sep 1, 2024
@mergify mergify bot deleted the mergify/bp/stable/10.1/pr-16711 branch September 1, 2024 23: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