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: <alpine.DEB.2.22.394.2111291602310.3554566@eliteleevi.tm.intel.com>
Date:   Mon, 29 Nov 2021 16:29:36 +0200 (EET)
From:   Kai Vehmanen <kai.vehmanen@...ux.intel.com>
To:     Mark Brown <broonie@...nel.org>
cc:     Takashi Iwai <tiwai@...e.de>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Liam Girdwood <lgirdwood@...il.com>,
        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

Hi,

On Mon, 29 Nov 2021, Mark Brown wrote:

> On Mon, Nov 29, 2021 at 10:23:07AM +0100, Takashi Iwai wrote:
> 
> > Mark, could you resolve in the latter branch?
> 
> I'll just leave them for now, Linus got angry about merging up fixes
> just to resolve conflicts so if it's not an actual dependency...

the asoc for-5.17 branch does have all the needed changes and the 
linux-next merged version seems ok. We've already sent many further 
changes that touch this area of code to asoc for-5.17. Let me know if some 
actions are needed to help.

Br, Kai