merge fixes

Author: ergawy

flang/lib/Optimizer/Transforms/DoConcurrentConversion.cpp

@@ -910,8 +910,9 @@ class DoConcurrentConversionPass
     }
     llvm::DenseSet<fir::DoLoopOp> concurrentLoopsToSkip;
     mlir::RewritePatternSet patterns(context);
+    patterns.insert<DoConcurrentConversion>(
         context, mapTo == fir::omp::DoConcurrentMappingKind::DCMK_Device,
-                                            concurrentLoopsToSkip);
+        concurrentLoopsToSkip);
     mlir::ConversionTarget target(*context);
     target.addLegalDialect<fir::FIROpsDialect, hlfir::hlfirDialect,
                            mlir::arith::ArithDialect, mlir::func::FuncDialect,