[Devel] [pm:testing 6/14] drivers//acpi/spcr.c:168:1: error: version control conflict marker in file