* linux-next: manual merge of the stackprotector tree
@ 2008-08-15 3:29 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2008-08-15 3:29 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Eric Sandeen, Mathieu Desnoyers
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
Hi all,
Today's linux-next merge of the stackprotector tree got a trivial
conflict in kernel/fork.c between commit
177a5f86ba5f60c783e24603bedf037d6c43a193 ("tracing, sched: LTTng
instrumentation - scheduler") from the ftrace tree and commit
7c9f8861e6c9c839f913e49b98c3854daca18f27 ("stackprotector: use canary at
end of stack to indicate overruns at oops time") from the stackprotector
tree.
Just overlapping additions of includes. I added both.
--
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] 2+ messages in thread
* linux-next: manual merge of the stackprotector tree
@ 2009-01-19 0:51 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2009-01-19 0:51 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
Hi all,
Today's linux-next merge of the stackprotector tree got conflicts in
arch/x86/include/asm/pda.h and arch/x86/include/asm/system.h against the
tip-core tree.
It looks like extensive changes have been made that have not been
propagated to the stackprotector tree yet, so I will drop it for today.
--
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] 2+ messages in thread
end of thread, other threads:[~2009-01-19 0:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-19 0:51 linux-next: manual merge of the stackprotector tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-08-15 3:29 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox