linux-kernel - Re: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250611122248.67996245@canb.auug.org.au>
Date: Wed, 11 Jun 2025 12:22:48 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Simona Vetter <simona.vetter@...ll.ch>
Cc: Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
 <dri-devel@...ts.freedesktop.org>, Dmitry Baryshkov
 <dmitry.baryshkov@...aro.org>, Dmitry Baryshkov
 <dmitry.baryshkov@....qualcomm.com>, Gabriel Dalimonte
 <gabriel.dalimonte@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Maxime Ripard <mripard@...nel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the
 drm-misc-fixes tree

Hi all,

On Wed, 11 Jun 2025 12:08:01 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/vc4/vc4_hdmi.c
> 
> between commit:
> 
>   c0317ad44f45 ("drm/vc4: fix infinite EPROBE_DEFER loop")
> 
> from the drm-misc-fixes tree and commit:
> 
>   d9f9bae6752f ("drm/bridge: allow limiting I2S formats")
> 
> from the drm-misc tree.
> 
> I fixed it up (the former removes code updated by the latter, so I just
> removed the code) 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.

Actually, the code was moved, not removed, so it needs the below merge
fix up.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 163d092bd973,4797ed1c21f4..000000000000
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -2285,12 -2291,6 +2285,12 @@@ static int vc4_hdmi_audio_init(struct v
  		return ret;
  	}
  
 +	ret = drm_connector_hdmi_audio_init(&vc4_hdmi->connector, dev,
- 					    &vc4_hdmi_audio_funcs, 8, false,
++					    &vc4_hdmi_audio_funcs, 8, 0, false,
 +					    -1);
 +	if (ret)
 +		return ret;
 +
  	dai_link->cpus		= &vc4_hdmi->audio.cpu;
  	dai_link->codecs	= &vc4_hdmi->audio.codec;
  	dai_link->platforms	= &vc4_hdmi->audio.platform;

Content of type "application/pgp-signature" skipped