Today's linux-next merge of the omap_dss2 tree got conflicts in drivers/video/omap2/dss/hdmi4_core.c drivers/video/omap2/dss/hdmi4_core.hcaused by commits ef26958 (omapdss: HDMI: Rename hdmi driver files to nicernames) and a few others that I didn't quite track down. But given that thediff of the merge commit is empty I guess everything's well.Thanks,Thierry