* linux-next: manual merge of the stackprotector tree with the x86 tree
@ 2009-02-17 1:34 Stephen Rothwell
2009-02-17 10:58 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-02-17 1:34 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the stackprotector tree with the x86 tree
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
2009-02-17 11:49 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2009-02-17 10:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Thomas Gleixner, H. Peter Anvin, linux-next
* 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the stackprotector tree with the x86 tree
2009-02-17 10:58 ` Ingo Molnar
@ 2009-02-17 11:49 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-02-17 11:49 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Thomas Gleixner, H. Peter Anvin, linux-next
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
Hi Ingo,
On Tue, 17 Feb 2009 11:58:39 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> ok - i also eliminated the conflict so interaction should go
> away in the next integration.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-17 11:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2009-02-17 11:49 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox