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,
Andrew Morton <akpm@linux-foundation•org>,
Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the x86 tree
Date: Fri, 11 Jul 2008 11:48:17 +1000 [thread overview]
Message-ID: <20080711114817.86703a4e.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 745 bytes --]
Hi all,
Today's linux-next merge of the x86 tree got conflicts in
arch/x86/kernel/traps_32.c and arch/x86/kernel/traps_64.c between commit
db47946e32824309a7815eddb78e838a5c276fb1 ("sysfs: crash debugging") from
the driver-core tree and commits e423f49fc8ccd761618748d7139638d8ddc1d16f
("x86: traps_xx: modify __die"), badc76527f7e29302f0bde3d366c59101fb2ab87
("x86: traps_xx: shuffle headers and globals") and
a8c1be9d2e78d8608892c86791837acf12da4bf6 ("x86: initial changes to unify
traps_32.c and traps_64.c") from the x86 tree.
I just applied the driver-core addition (one line in each case) to the
x86 tree versions.
--
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:[~2008-07-11 1:48 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-11 1:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 2:23 linux-next: manual merge of the x86 tree Stephen Rothwell
2008-09-11 23:37 Stephen Rothwell
2008-09-14 15:16 ` Ingo Molnar
2008-09-14 18:11 ` Stephen Rothwell
2008-09-11 23:34 Stephen Rothwell
2008-09-14 15:18 ` Ingo Molnar
2008-09-14 18:13 ` Stephen Rothwell
2008-09-03 0:57 Stephen Rothwell
2008-09-05 16:00 ` Ingo Molnar
2008-09-02 1:32 Stephen Rothwell
2008-09-05 18:22 ` Ingo Molnar
2008-08-15 3:58 Stephen Rothwell
2008-07-31 2:59 Stephen Rothwell
2008-07-23 2:51 Stephen Rothwell
2008-07-18 2:29 Stephen Rothwell
2008-07-17 1:43 Stephen Rothwell
2008-07-15 2:26 Stephen Rothwell
2008-07-14 1:30 Stephen Rothwell
2008-07-11 1:47 Stephen Rothwell
2008-07-08 0:56 Stephen Rothwell
2008-07-08 3:22 ` Jeremy Fitzhardinge
2008-07-08 5:01 ` Stephen Rothwell
2008-07-08 5:28 ` Jeremy Fitzhardinge
2008-07-08 5:39 ` Ingo Molnar
2008-07-08 0:52 Stephen Rothwell
2008-07-04 3:50 Stephen Rothwell
2008-07-04 3:41 Stephen Rothwell
2008-07-04 9:41 ` Ingo Molnar
2008-06-25 2:28 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=20080711114817.86703a4e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=greg@kroah$(echo .)com \
--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