Rather than using 2 different functions for different types of conflicts use a bitmask to specify what conflicts need to be checked. This allows a better way to make exceptions. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 883be4893049aa97cb874d239cf6b06325fc74f2 Component: engine