Hi all,
Today's linux-next merge of the x86 tree got a conflict in
arch/x86/mm/init_64.c between commit
b27a43c1e90582facad44de67d02bc9e9f900289 ("x86, cpa: make the kernel
physical mapping initialization a two pass sequence") from Linus' tree
and commit 065ae73c5462d42e9761afb76f2b52965ff45bd6 ("x86, cpa: make the
kernel physical mapping initialization a two pass sequence") from the x86
tree.
The former is clearly a fixed version of the latter, but I cannot easily
see how to resolve them given other changes to this file in both trees.
I think my only option (given time constraints) is to drop the x86 tree
for today in the hope that it will be fixed by those who understand the
code.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpJavgJ48Zcx.pgp
Description: PGP signature
