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

Message-ID: <20170614143055.5v6j4i5au3t3fw7s@sirena.org.uk>
Date:   Wed, 14 Jun 2017 15:30:55 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Rob Herring <robherring2@...il.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the
 sound-asoc tree

On Wed, Jun 14, 2017 at 08:55:37AM -0500, Rob Herring wrote:

> Sakari, I forgot about these other changes and the resolution is more
> complex than I want to pass on to Linus. Has the branch I provided
> been pulled in (I guess not since this is the first I've seen of the
> conflict)? We should drop the move for now and do it late in the merge
> window or post -rc1. It can be after your other changes.

I can send you a pull request for the changes in my tree so you can do
the resolution if that helps?

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