Merge conflict resolution for CoreSight ACPI TRBE support