diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py index 1d05810c..b5a104b2 100755 --- a/scripts/dbgbmap.py +++ b/scripts/dbgbmap.py @@ -4603,7 +4603,12 @@ def main_(ring, disk, mroots=None, *, # check for some common issues # block conflict? - if b in bmap and bmap[b].type != 'unused': + # + # note we can't compare more than types due to different + # trunks, slicing, etc + if (b in bmap + and bmap[b].type != 'unused' + and bmap[b].type != type): if bmap[b].type == 'conflict': bmap[b].value.append(child) else: diff --git a/scripts/dbgbmapd3.py b/scripts/dbgbmapd3.py index 88dd42cc..7a597bde 100755 --- a/scripts/dbgbmapd3.py +++ b/scripts/dbgbmapd3.py @@ -4322,7 +4322,12 @@ def main(disk, output, mroots=None, *, # check for some common issues # block conflict? - if b in bmap and bmap[b].type != 'unused': + # + # note we can't compare more than types due to different + # trunks, slicing, etc + if (b in bmap + and bmap[b].type != 'unused' + and bmap[b].type != type): if bmap[b].type == 'conflict': bmap[b].value.append(child) else: