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, Jeremy Fitzhardinge <jeremy@goop•org>
Subject: linux-next: manual merge of the kmemcheck tree with the tree
Date: Thu, 12 Feb 2009 16:38:25 +1100 [thread overview]
Message-ID: <20090212163825.ec7bcdd0.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
Hi all,
Today's linux-next merge of the kmemcheck tree got conflicts in
arch/x86/include/asm/pgtable_32.h arch/x86/include/asm/pgtable_64.h
between the unification commits in the x86 tree and commit
5faef0d73631a368f375a5b852e7149f44542670 ("Merge commit 'v2.6.28-rc2'
into kmemcheck") from the kmemcheck tree.
I used the resolution 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 --]
next reply other threads:[~2009-02-12 5:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 5:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-02-02 6:13 linux-next: manual merge of the kmemcheck tree with the 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=20090212163825.ec7bcdd0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jeremy@goop$(echo .)org \
--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