From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the stackprotector tree
Date: Mon, 19 Jan 2009 11:51:59 +1100 [thread overview]
Message-ID: <20090119115159.4437cd09.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2009-01-19 0:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-19 0:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-08-15 3:29 linux-next: manual merge of the stackprotector tree 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=20090119115159.4437cd09.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
/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