linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with the pm 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: <20170705101950.rjgio6qms2o7zdfk@sirena.org.uk>
Date:   Wed, 5 Jul 2017 11:19:50 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Takashi Iwai <tiwai@...e.de>
Cc:     Rob Herring <robh@...nel.org>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Liam Girdwood <lgirdwood@...il.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the pm tree

On Wed, Jul 05, 2017 at 10:12:56AM +0200, Takashi Iwai wrote:

> For your convenience, I branched off topic/of-graph-base that contains
> only the minimal set of commits that conflict with drivers/of/*.
> Feel free to use this branch instead of the branches above.

I did suggest doing this when the conflict originally came up :(

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