Re: linux-next: manual merge of the akpm-current tree with the random tree

From	Andrew Morton <akpm@linux-foundation.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the akpm-current tree with the random tree
Date	2017-06-29 23:10 +0200
Message-ID	<tXORj-4sl-5@gated-at.bofh.it> (permalink)
References	<tPZ7b-BL-7@gated-at.bofh.it> <tXekO-3ac-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Wed, 28 Jun 2017 16:03:48 +1000 Stephen Rothwell <sfr@canb.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.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the akpm-current tree with the  random tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-28 08:10 +0200
  Re: linux-next: manual merge of the akpm-current tree with the  random tree Andrew Morton <akpm@linux-foundation.org> - 2017-06-29 23:10 +0200

csiph-web