From: Takashi Iwai <tiwai@suse•de>
To: Mark Brown <broonie@kernel•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Liam Girdwood <lgirdwood@gmail•com>, Takashi Iwai <tiwai@suse•de>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Mon, 14 Jul 2025 11:18:16 +0200 [thread overview]
Message-ID: <87frez871j.wl-tiwai@suse.de> (raw)
In-Reply-To: <20250714130122.58f531e5@canb.auug.org.au>
On Mon, 14 Jul 2025 05:01:22 +0200,
Stephen Rothwell wrote:
>
> 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
>
The conflict resolution looks good, thanks.
Mark, could you send an early PR for 6.17 about ASoC stuff?
I'd like to catch up the conflicts earlier.
thanks,
Takashi
next prev parent reply other threads:[~2025-07-14 9:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-14 3:01 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
2025-07-14 9:18 ` Takashi Iwai [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-20 1:26 Stephen Rothwell
2023-09-25 1:54 Stephen Rothwell
2019-11-12 1:26 Stephen Rothwell
2019-10-16 0:33 Stephen Rothwell
2019-10-07 23:52 Stephen Rothwell
2019-08-09 3:31 Stephen Rothwell
2019-08-09 3:16 Stephen Rothwell
2019-08-01 2:50 Stephen Rothwell
2019-08-01 16:46 ` Pierre-Louis Bossart
2015-02-04 2:44 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87frez871j.wl-tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox