Messages in this thread | | | Date | Tue, 14 Sep 2010 10:51:29 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the m68knommu tree with the m68k tree |
| |
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in arch/m68k/sun3/sun3ints.c between commit 72fe185cd9acbfc6e8a7afa884ae1152be706e52 ("m68k/m68knommu: Remove dead SMP config option") from the m68k tree and commit 5313b581e4efc214c6132d32f580db6668e5c5a8 ("arch/m68k{,nommu}: Removing dead SMP config option") from the m68knommu tree.
These appear to be the same patch with some formatting differences. I used the version from the m68k tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |