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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <aW-Rn_qcNP2CgOm2@sirena.org.uk>
Date: Tue, 20 Jan 2026 14:30:55 +0000
From: Mark Brown <broonie@...nel.org>
To: Simona Vetter <simona.vetter@...ll.ch>,
	Intel Graphics <intel-gfx@...ts.freedesktop.org>,
	DRI <dri-devel@...ts.freedesktop.org>
Cc: Chen Ni <nichen@...as.ac.cn>, Chun-Kuang Hu <chunkuang.hu@...nel.org>,
	Dmitry Baryshkov <dmitry.baryshkov@....qualcomm.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: 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
--- a/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)