linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with the sound-current 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <s5ho8635n9g.wl-tiwai@suse.de>
Date:   Mon, 29 Nov 2021 10:23:07 +0100
From:   Takashi Iwai <tiwai@...e.de>
To:     Mark Brown <broonie@...nel.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Liam Girdwood <lgirdwood@...il.com>,
        Takashi Iwai <tiwai@...e.de>,
        Kai Vehmanen <kai.vehmanen@...ux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ranjani Sridharan <ranjani.sridharan@...ux.intel.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree

On Mon, 29 Nov 2021 01:35:54 +0100,
Stephen Rothwell wrote:
> 
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in:
> 
>   sound/soc/sof/intel/hda.c
> 
> between commit:
> 
>   86f74ba3fef5 ("ASoC: SOF: hda: reset DAI widget before reconfiguring it")
> 
> from the sound-current tree and commit:
> 
>   a0f84dfb3f6d ("ASoC: SOF: IPC: dai: Expand DAI_CONFIG IPC flags")
> 
> from the sound-asoc tree.
> 
> I fixed it up (I just used the latter version) 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.

Both are from ASoC tree, while the former landed in my sound git tree
for-linus branch recently.

Mark, could you resolve in the latter branch?


thanks,

Takashi