fix conflicts

Signed-off-by: hanhanW <hanhan0912@gmail.com>

Author: hanhanW

compiler/src/iree/compiler/Codegen/Common/ReconcileTranslationInfo.cpp

@@ -860,8 +860,8 @@ void ReconcileTranslationInfoPass::runOnOperation() {
       // workgroup_size/subgroup_size can be propagated to the export.
       Location loc = rootFuncOp.getLoc();
       rewriter.setInsertionPointAfter(rootFuncOp);
-      configOp = IREE::Codegen::DispatchConfigOp::create(rewriter, loc,
-                                                         rootFuncOp.getName());
+      configOp = IREE::Codegen::DispatchConfigOp::create(
+          rewriter, loc, FlatSymbolRefAttr::get(rootFuncOp.getNameAttr()));
       Block *block = rewriter.createBlock(&configOp.getBody());
       rewriter.setInsertionPointToStart(block);
       auto c1 = arith::ConstantIndexOp::create(rewriter, loc, 1);