From: Andrew Morton <akpm@linux-foundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Theodore Ts'o <tytso@mit•edu>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Rik van Riel <riel@redhat•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the random tree
Date: Thu, 29 Jun 2017 14:04:01 -0700 [thread overview]
Message-ID: <20170629140401.7aa5b79333c9f4cfa0958fed@linux-foundation.org> (raw)
In-Reply-To: <20170628160348.16d15d02@canb.auug.org.au>
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.
next prev parent reply other threads:[~2017-06-29 21:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 6:28 linux-next: manual merge of the akpm-current tree with the random tree Stephen Rothwell
2017-06-28 6:03 ` Stephen Rothwell
2017-06-29 21:04 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-18 7:44 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170629140401.7aa5b79333c9f4cfa0958fed@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=Jason@zx2c4$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=riel@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox