On Wed, 28 Jun 2017 16:03:48 +1000 Stephen Rothwell <[email protected]> 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.
