Messages in this thread | | | Date | Wed, 9 Dec 2009 15:06:27 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |