Merge PR #31472 into master

* refs/pull/31472/head:
	mon/MonMap: encode (more) valid compat monmap when we have v2-only addrs

Reviewed-by: Xiaoxi Chen <superdebuger@gmail.com>

diff --cc .githubmap
index dc85b6ebff3ea33b5beec9295ba988d1e75f179a,dc85b6ebff3ea33b5beec9295ba988d1e75f179a..8e63cfe6e85c3d7014c1eaf99d32e1638cd2e851
--- 1/.githubmap
--- 2/.githubmap
+++ b/.githubmap
@@@ -105,3 -105,3 +105,4 @@@ sidharthanup Sidharth Anupkrishnan <san
  varshar16 Varsha Rao <varao@redhat.com>
  guits Guillaume Abrioux <gabrioux@redhat.com>
  mgfritch Michael Fritch <mfritch@suse.com>
++xiaoxichen Xiaoxi Chen <superdebuger@gmail.com>