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

From: Vinod Koul <[email-masked]>
Date: Tue, 19 Nov 2024 11:55:44 +0530

On 15/11/24 09:31, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the soundwire tree got a conflict in:
> 
>    include/linux/soundwire/sdw.h
> 
> between commit:
> 
>    3a513da1ae33 ("ASoC: SDCA: add initial module")
> 
> from the sound-asoc tree and commit:
> 
>    e311b04db66a ("soundwire: Update the includes on the sdw.h header")
> 
> from the soundwire 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.

Thanks, this looks right to me and will let Linus know when I send the 
pull request

-- 
~Vinod