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: <YaTDKNOOP2I2dbI+@sirena.org.uk>
Date:   Mon, 29 Nov 2021 12:10:16 +0000
From:   Mark Brown <broonie@...nel.org>
To:     Takashi Iwai <tiwai@...e.de>
Cc:     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

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...

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)