linux-kernel - Re: linux-next: manual merge of the tip tree with the FIXME 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: <20171012083645.o5prct7zs4gqfw2f@sirena.co.uk>
Date:   Thu, 12 Oct 2017 09:36:45 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Will Deacon <will.deacon@....com>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Martin Schwidefsky <schwidefsky@...ibm.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the FIXME tree

On Wed, Oct 11, 2017 at 06:23:29PM +0100, Will Deacon wrote:
> On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote:

> > I'm don't feel confident I can resolve this conflict sensibly without
> > taking too long so I've used the tip tree from yesterday.

> It's a shame that the conflict is so messy -- most of it is just context
> because that file has changed a lot in the s390 tree so the cleanup doesn't
> apply. I resolved it below.

Thanks, I'll give that a spin today.  It did look like it should be fine
but it was such a mess I didn't want to try to resolve by hand.

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