Subject: linux-next: manual merge of the sound-asoc tree with the sound tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 14 Jul 2025 13:01:22 +1000

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  sound/soc/codecs/hdac_hdmi.c

between commit:

  ed677858d4fe ("ALSA: hda: Move widget capability macros into hdaudio.h")

from the sound tree and commit:

  039de8f598dd ("ASoC: hdac_hdmi: remove hdac_hdmi_jack[_port]_init()")

from the sound-asoc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/soc/codecs/hdac_hdmi.c
index b33cd5178008,3aae0a2eb047..000000000000
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@@ -24,7 -24,7 +24,6 @@@
  #include <sound/hda_i915.h>
  #include <sound/pcm_drm_eld.h>
  #include <sound/hda_chmap.h>
- #include "hdac_hdmi.h"
 -#include "../../hda/local.h"
  
  #define NAME_SIZE	32