gistfile1.txt

lucas@lucas-S2600CW:~/p/linux-dim/drm-tip$ git diff                                                                                                                                                                                                                                                                                                                                                                                      
diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c                                                                                                                                                                                                                                                                                                                                                                                             
index ccb0511b9cd5,1487cc308c5d..000000000000                                                                                                                                                                                                                                                                                                                                                                                            
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c                                                                                                                                                                                                                                                                                                                                                                                                 
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c                                                                                                                                                                                                                                                                                                                                                                                                 
@@@ -1060,6 -1032,12 +1072,15 @@@ static int mtk_dsi_probe(struct platfor                                                                                                                                                                                                                                                                                                                                                                
                return ret;                                                                                                                                                                                                                                                                                                                                                                                                              
        }                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                                                                                                                                                                                                                                         
++<<<<<<< HEAD                                                                                                                                                                                                                                                                                                                                                                                                                           
++=======                                                                                                                                                                                                                                                                                                                                                                                                                                
+       dsi->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
+       if (IS_ERR(dsi->next_bridge)) {                                                                   
+               ret = PTR_ERR(dsi->next_bridge);                                                          
+               goto err_unregister_host;                                                                 
+       }                                                                                                 
+                                                                                                         
++>>>>>>> drm-misc/drm-misc-next                                                                          
        dsi->driver_data = of_device_get_match_data(dev);
                                                                                                          
        dsi->engine_clk = devm_clk_get(dev, "engine");