linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with the drm-misc 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: <20171018162631.qceuluxqpv3xu2xb@sirena.co.uk>
Date:   Wed, 18 Oct 2017 17:26:31 +0100
From:   Mark Brown <broonie@...nel.org>
To:     "Deucher, Alexander" <Alexander.Deucher@....com>
Cc:     "Mukunda, Vijendar" <Vijendar.Mukunda@....com>,
        "Zhu, Rex" <Rex.Zhu@....com>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "alsa-devel@...a-project.org" <alsa-devel@...a-project.org>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the
 drm-misc tree

On Wed, Oct 18, 2017 at 02:33:37PM +0000, Deucher, Alexander wrote:

Please fix your mail client to word wrap within paragraphs at something
substantially less than 80 columns.  Doing this makes your messages much
easier to read and reply to.

> Your conflict change affectively reverted 1e4448648333a which is what
> caused the problem.  It looks like Dave did not yet pull the request I
> made.  I can send another pull request, but you may run into the same
> issue if you resolve the conflict the same way again.  

OK...  I really wasn't expecting to see any conflicts at all TBH.  I'll
have a look tomorrow.

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