On Tue, Mar 22, 2011 at 05:43, <gerg@xxxxxxxxxxxx> wrote: > The following patch merges the m68k and m68knommu arch directories. > This patch has been trimmed for review purposes - the automated file > moving and mergeing carried out by the script contained in this email > has been removed. Only the manually required changes after running the > script are shown as the patch. (So to end up with the final required > change you need to run this script then apply the patch). > > This change is available as the only commit on the m68knommu git tree, > for-linux branch: > > The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d: > ÂLinus Torvalds (1): > Â Â Â ÂMerge branch 'for-linus' of git://git.kernel.org/.../dtor/input > > are available in the git repository at: > > Âgit://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus > > Greg Ungerer (1): > Â Â Âm68k: merge m68k and m68knommu arch directories > > > It is also on the for-next branch in that tree, so will get some testing > in the next tree for the next few days. defconfig is now a nommu-config, and it fails? http://kisskb.ellerman.id.au/kisskb/buildresult/4012794/ arch/m68k/kernel/entry_no.S:47: Error: Unknown operator -- statement `save_all' ignored arch/m68k/kernel/entry_no.S:56: Error: Unknown operator -- statement `save_all' ignored arch/m68k/kernel/entry_no.S:92: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/kernel/entry_no.S:96: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/kernel/entry_no.S:100: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/kernel/entry_no.S:104: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/kernel/entry_no.S:108: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/kernel/entry_no.S:112: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/kernel/entry_no.S:116: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/kernel/entry_no.S:118: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/kernel/entry_no.S:122: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/kernel/entry_no.S:124: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/platform/coldfire/entry.S:65: Error: Unknown operator -- statement `save_all' ignored arch/m68k/platform/coldfire/entry.S:92: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/platform/coldfire/entry.S:94: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/platform/coldfire/entry.S:100: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/platform/coldfire/entry.S:104: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/platform/coldfire/entry.S:144: Error: Unknown operator -- statement `restore_user' ignored arch/m68k/platform/coldfire/entry.S:156: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/platform/coldfire/entry.S:160: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/platform/coldfire/entry.S:169: Error: Unknown operator -- statement `save_all' ignored arch/m68k/platform/coldfire/entry.S:193: Error: Unknown operator -- statement `rdusp' ignored arch/m68k/platform/coldfire/entry.S:196: Error: operands mismatch -- statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored arch/m68k/platform/coldfire/entry.S:199: Error: operands mismatch -- statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored arch/m68k/platform/coldfire/entry.S:202: Error: Unknown operator -- statement `wrusp' ignored Gr{oetje,eeting}s, Â Â Â Â Â Â Â Â Â Â Â Â Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. Â Â Â Â Â Â Â Â Â Â Â Â Â ÂÂ ÂÂ -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
