From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the stackprotector tree with the x86 tree
Date: Tue, 17 Feb 2009 11:58:39 +0100 [thread overview]
Message-ID: <20090217105839.GE6602@elte.hu> (raw)
In-Reply-To: <20090217123435.8929e3dd.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the stackprotector tree got a conflict in
> arch/x86/kernel/setup_percpu.c between various commits from the x86 tree
> and commit 18e7651254221ad0d3cf993cce742858c4521c55 ("manual merge of
> stackprotector") from the stackprotector tree.
>
> I just used the version of this file from tip/master.
ok - i also eliminated the conflict so interaction should go
away in the next integration.
Ingo
next prev parent reply other threads:[~2009-02-17 10:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-17 1:34 linux-next: manual merge of the stackprotector tree with the x86 tree Stephen Rothwell
2009-02-17 10:58 ` Ingo Molnar [this message]
2009-02-17 11:49 ` 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=20090217105839.GE6602@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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