linux-next: manual merge of the drm-misc tree with the drm-next tree

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

drivers/gpu/drm/mediatek/mtk_hdmi_v2.c

between commit:

f9c68b1c5be43 ("drm/mediatek: mtk_hdmi_v2: Remove unneeded semicolon")

from the drm-next tree and commit:

b626b1a1c9cca ("drm/bridge: refactor HDMI InfoFrame callbacks")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

diff --cc drivers/gpu/drm/mediatek/mtk_hdmi_v2.c
index d510ca8cfc4a5,d0e4440b74911..0000000000000