linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the random 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: <20170629140401.7aa5b79333c9f4cfa0958fed@linux-foundation.org>
Date:   Thu, 29 Jun 2017 14:04:01 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Theodore Ts'o" <tytso@....edu>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Jason A. Donenfeld" <Jason@...c4.com>,
        Rik van Riel <riel@...hat.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 random tree

On Wed, 28 Jun 2017 16:03:48 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi Andrew,
> 
> [Yes, top posting :-)]
> 
> With the merge window approaching, just a reminder that this conflict
> still exists.

huh, it was only a teeny thing.

I moved 

randomstackprotect-introduce-get_random_canary-function.patch
forkrandom-use-get_random_canary-to-set-tsk-stack_canary.patch
x86-ascii-armor-the-x86_64-boot-init-stack-canary.patch
arm64-ascii-armor-the-arm64-boot-init-stack-canary.patch
sh64-ascii-armor-the-sh64-boot-init-stack-canary.patch

to be post-linux-next and refreshed, so it should be good now.