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

[kbuild test robot <fengguang.wu@xxxxxxxxx>]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git testing
head:   c394fc6acab189ab34001d7b994e5b3c7fae66c3
commit: f69ba1326ac33b30659e1b64911391a37ae8a13f [6/14] Merge branch 'acpi-spcr' into linux-next
config: arm64-allmodconfig (attached as .config)
compiler: aarch64-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        git checkout f69ba1326ac33b30659e1b64911391a37ae8a13f
        # save the attached .config to linux build tree
        make.cross ARCH=arm64 

All errors (new ones prefixed by >>):

   drivers//acpi/spcr.c: In function 'parse_spcr':
>> drivers//acpi/spcr.c:168:1: error: version control conflict marker in file
    <<<<<<< HEAD
    ^~~~~~~
   drivers//acpi/spcr.c:198:1: error: version control conflict marker in file
    >>>>>>> acpi-spcr
    ^~~~~~~
   At top level:
   drivers//acpi/spcr.c:34:13: warning: 'qdf2400_erratum_44_present' defined but not used [-Wunused-function]
    static bool qdf2400_erratum_44_present(struct acpi_table_header *h)
                ^~~~~~~~~~~~~~~~~~~~~~~~~~

vim +168 drivers//acpi/spcr.c

    75	
    76	/**
    77	 * parse_spcr() - parse ACPI SPCR table and add preferred console
    78	 *
    79	 * @earlycon: set up earlycon for the console specified by the table
    80	 *
    81	 * For the architectures with support for ACPI, CONFIG_ACPI_SPCR_TABLE may be
    82	 * defined to parse ACPI SPCR table.  As a result of the parsing preferred
    83	 * console is registered and if @earlycon is true, earlycon is set up.
    84	 *
    85	 * When CONFIG_ACPI_SPCR_TABLE is defined, this function should be called
    86	 * from arch initialization code as soon as the DT/ACPI decision is made.
    87	 *
    88	 */
    89	int __init parse_spcr(bool earlycon)
    90	{
    91		static char opts[64];
    92		struct acpi_table_spcr *table;
    93		acpi_status status;
    94		char *uart;
    95		char *iotype;
    96		int baud_rate;
    97		int err;
    98	
    99		if (acpi_disabled)
   100			return -ENODEV;
   101	
   102		status = acpi_get_table(ACPI_SIG_SPCR, 0,
   103					(struct acpi_table_header **)&table);
   104	
   105		if (ACPI_FAILURE(status))
   106			return -ENOENT;
   107	
   108		if (table->header.revision < 2) {
   109			err = -ENOENT;
   110			pr_err("wrong table version\n");
   111			goto done;
   112		}
   113	
   114		if (table->serial_port.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
   115			switch (ACPI_ACCESS_BIT_WIDTH((
   116				table->serial_port.access_width))) {
   117			default:
   118				pr_err("Unexpected SPCR Access Width.  Defaulting to byte size\n");
   119			case 8:
   120				iotype = "mmio";
   121				break;
   122			case 16:
   123				iotype = "mmio16";
   124				break;
   125			case 32:
   126				iotype = "mmio32";
   127				break;
   128			}
   129		} else
   130			iotype = "io";
   131	
   132		switch (table->interface_type) {
   133		case ACPI_DBG2_ARM_SBSA_32BIT:
   134			iotype = "mmio32";
   135			/* fall through */
   136		case ACPI_DBG2_ARM_PL011:
   137		case ACPI_DBG2_ARM_SBSA_GENERIC:
   138		case ACPI_DBG2_BCM2835:
   139			uart = "pl011";
   140			break;
   141		case ACPI_DBG2_16550_COMPATIBLE:
   142		case ACPI_DBG2_16550_SUBSET:
   143			uart = "uart";
   144			break;
   145		default:
   146			err = -ENOENT;
   147			goto done;
   148		}
   149	
   150		switch (table->baud_rate) {
   151		case 3:
   152			baud_rate = 9600;
   153			break;
   154		case 4:
   155			baud_rate = 19200;
   156			break;
   157		case 6:
   158			baud_rate = 57600;
   159			break;
   160		case 7:
   161			baud_rate = 115200;
   162			break;
   163		default:
   164			err = -ENOENT;
   165			goto done;
   166		}
   167	
 > 168	<<<<<<< HEAD

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Attachment: .config.gz
Description: application/gzip