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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpTx9mXKukz1.pgp
Description: PGP signature
