Hi all, Today's linux-next merge of the tip tree got conflicts in arch/x86/include/asm/x86_init.h and arch/x86/kernel/x86_init.c between a merge in Linus' tree and a merge in the tip tree. Two fields of a structure just ended up in a different order after the two merges. I used the version from Linus' tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp86VZUi2dJQ.pgp
Description: PGP signature
