linux-kernel - Re: linux-next: manual merge of the akpm tree with the tip 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]

Date:   Mon, 16 Oct 2017 21:01:54 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Ingo Molnar <mingo@...nel.org>
Cc:     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 akpm tree with the tip tree

On Mon, Oct 16, 2017 at 07:48:10PM +0100, Mark Brown wrote:

> I don't feel confident fixing this up, I'm trying to figure out how to
> drop one of the commits but this script isn't the clearest in it's
> intent.

OK, I might've figured it out or I might've made a terrible mess.
Either way it seems to pass a basic smoke test.

Later on in the merge process I also found additional conflicts,
including extensive conflicts which look like reformatting issues in
btrfs.

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