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: i386-randconfig-a0-201646 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout e74ee64c77fb60776247b9f8f5e478117c32cd0f # save the attached .config to linux build tree make ARCH=i386
All error/warnings (new ones prefixed by >>): drivers/base/power/main.c: In function '__device_suspend_late': >> drivers/base/power/main.c:1250:1: error: version control conflict marker in >> file <<<<<<< .merge_file_UbV94o ^~~~~~~ drivers/base/power/main.c:1254:1: error: version control conflict marker in file >>>>>>> .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 1222 * @async: If true, the device is being suspended asynchronously. 1223 * 1224 * Runtime PM is disabled for @dev while this function is being executed. 1225 */ 1226 static int __device_suspend_late(struct device *dev, pm_message_t state, bool async) 1227 { > 1228 pm_callback_t callback = NULL; > 1229 char *info = NULL; 1230 int error = 0; 1231 1232 TRACE_DEVICE(dev); 1233 TRACE_SUSPEND(0); 1234 1235 __pm_runtime_disable(dev, false); 1236 1237 dpm_wait_for_children(dev, async); 1238 1239 if (async_error) 1240 goto Complete; 1241 1242 if (pm_wakeup_pending()) { 1243 async_error = -EBUSY; 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
.config.gz
Description: application/gzip
_______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu