Messages in this thread | | | Date | Mon, 6 Jul 2009 12:05:58 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rr tree with Linus' tree |
| |
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in arch/mips/kernel/smp-cmp.c between commit 0365070f05f12f1648b4adf22cfb52ec7a8a371c ("MIPS: CMP: activate CMP support") from Linus' tree and commit e7cb633472a7c3b197e2696e6a3d19a981e8988f ("cpumask:use-cpumap-accessors-mips") from the rr tree.
The former removes the code that the latter modifies in this file, so I used the former version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |