Merge pull request #17219 from zhou-run/202406201119

isisd: When the ISIS types of the routers do not match on a P2P link, the neighbor status remains UP

diff --cc tests/topotests/isis_topo1/test_isis_topo1.py
Simple merge