[iommu:next 1/1] drivers/base/power/main.c:1250:1: error: expected expression before '<<' token

[kbuild test robot]

tree: https://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git next
head: e74ee64c77fb60776247b9f8f5e478117c32cd0f
commit: e74ee64c77fb60776247b9f8f5e478117c32cd0f [1/1] Merge branches 'arm/mediatek', 'x86/amd', 'core' and 'arm/exynos' into next
config: x86_64-randconfig-i0-201646 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
reproduce:
git checkout e74ee64c77fb60776247b9f8f5e478117c32cd0f
# save the attached .config to linux build tree
make ARCH=x86_64

drivers/base/power/main.c:1250:1: error: expected expression before '<<' token

<<<<<<< .merge_file_UbV94o
^
drivers/base/power/main.c:1254:1: error: expected expression before '>>' token

.merge_file_S2sOXo

^
drivers/base/power/main.c:1229:8: warning: unused variable 'info' [-Wunused-variable]
char *info = NULL;
^
drivers/base/power/main.c:1228:16: warning: unused variable 'callback' [-Wunused-variable]
pm_callback_t callback = NULL;
^

vim +1250 drivers/base/power/main.c

1244 goto Complete;
1245 }
1246
1247 if (dev->power.syscore || dev->power.direct_complete)
1248 goto Complete;
1249

1250 <<<<<<< .merge_file_UbV94o

1251 =======
1252 dpm_wait_for_subordinate(dev, async);
1253

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