From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vegard Nossum <vegard.nossum@gmail•com>,
Pekka Enberg <penberg@cs•helsinki.fi>,
Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the kmemcheck tree with the x86 tree
Date: Fri, 6 Mar 2009 17:19:01 +1100 [thread overview]
Message-ID: <20090306171901.1abefadd.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_32.c between various commits from the x86 tree and
commits a7fff94fffaa0cecb923d6c1bb9b7691f608b49a ("Revert "kmemcheck: use
set_memory_4k() instead of disabling PSE"") and
760932c8607b736504a134ed6feec25e90e089ac ("kmemcheck: (finally) use 4k
pages for identity mapping") from the kmemcheck tree.
I fixed it up as in the tip/master branch (patching arch/x86/mm/init.c as
well).
--
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-03-06 6:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 6:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-01 7:55 linux-next: manual merge of the kmemcheck tree with the x86 tree Stephen Rothwell
2009-03-19 7:49 Stephen Rothwell
2009-03-06 6:24 Stephen Rothwell
2009-03-06 6:04 Stephen Rothwell
2009-01-23 4:44 Stephen Rothwell
2009-01-23 14:21 ` Pekka Enberg
2009-01-23 15:53 ` Ingo Molnar
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=20090306171901.1abefadd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=vegard.nossum@gmail$(echo .)com \
/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