[luto:mmots_ti_in_task 386/421] drivers/gpu/drm/i915/intel_opregion.c:1081:1: error: version control conflict marker in file

[kbuild test robot <fengguang.wu@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 2688 bytes --]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git mmots_ti_in_task
head:   aab5abfcf5567bcbf18e3b980cd44375e535c476
commit: d30dc04764cd3d6553d13309549ac7aac65fde3b [386/421] x86: dma-mapping: use unsigned long for dma_attrs
config: i386-defconfig (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
reproduce:
        git checkout d30dc04764cd3d6553d13309549ac7aac65fde3b
        # save the attached .config to linux build tree
        make ARCH=i386 

All error/warnings (new ones prefixed by >>):

   drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_get_panel_type':
>> drivers/gpu/drm/i915/intel_opregion.c:1081:1: error: version control conflict marker in file
    <<<<<<< HEAD
    ^~~~~~~
>> drivers/gpu/drm/i915/intel_opregion.c:1091:1: error: expected declaration or statement at end of input
    }
    ^
>> drivers/gpu/drm/i915/intel_opregion.c:1091:1: warning: control reaches end of non-void function [-Wreturn-type]
    }
    ^

vim +1081 drivers/gpu/drm/i915/intel_opregion.c

93d21d33 mmots auto import 2016-07-16  1075  	/*
93d21d33 mmots auto import 2016-07-16  1076  	 * FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us
93d21d33 mmots auto import 2016-07-16  1077  	 * low vswing for eDP, whereas the VBT panel type (2) gives us normal
93d21d33 mmots auto import 2016-07-16  1078  	 * vswing instead. Low vswing results in some display flickers, so
93d21d33 mmots auto import 2016-07-16  1079  	 * let's simply ignore the OpRegion panel type on SKL for now.
93d21d33 mmots auto import 2016-07-16  1080  	 */
767fb54e mmots auto import 2016-07-16 @1081  <<<<<<< HEAD
93d21d33 mmots auto import 2016-07-16  1082  	if (IS_SKYLAKE(dev)) {
767fb54e mmots auto import 2016-07-16  1083  =======
767fb54e mmots auto import 2016-07-16  1084  	if (IS_SKYLAKE(dev_priv)) {
767fb54e mmots auto import 2016-07-16  1085  >>>>>>> linux-next/akpm-base
93d21d33 mmots auto import 2016-07-16  1086  		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
93d21d33 mmots auto import 2016-07-16  1087  		return -ENODEV;
93d21d33 mmots auto import 2016-07-16  1088  	}
93d21d33 mmots auto import 2016-07-16  1089  
a0562819 Ville Syrjala     2016-04-11  1090  	return ret - 1;
a0562819 Ville Syrjala     2016-04-11 @1091  }

:::::: The code at line 1081 was first introduced by commit
:::::: 767fb54e549df828e562bf7d37ab645481486536 linux-next

:::::: TO: mmots auto import <mm-commits@vger.kernel.org>
:::::: CC: Johannes Weiner <hannes@cmpxchg.org>

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

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 25026 bytes --]