linux-kernel - Re: linux-next: manual merge of the soundwire tree with the sound-asoc 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: <0f117213-7001-4bc1-a9af-335d10be3489@kernel.org>
Date: Tue, 19 Nov 2024 11:55:44 +0530
From: Vinod Koul <vkoul@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Vinod Koul <vkoul@...nel.org>,
 Mark Brown <broonie@...nel.org>, Liam Girdwood <lgirdwood@...il.com>
Cc: Bard Liao <yung-chuan.liao@...ux.intel.com>,
 Charles Keepax <ckeepax@...nsource.cirrus.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Pierre-Louis Bossart <pierre-louis.bossart@...ux.dev>,
 Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>
Subject: Re: linux-next: manual merge of the soundwire tree with the
 sound-asoc tree

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