Hi Linus, Can you please pull the m68knommu git tree, for-linus branch: git@xxxxxxxxxx:gregungerer/m68knommu.git for-linus There is a big cleanup and reworking of the Kconfig files. They are no longer splilt on the somewhat arbitary basis of MMU and non-MMU targets. Also some other merging and cleaning up of arch Makefiles, and the trap handling code. Of course a couple of bug fixes in there too. Thanks Greg The following changes since commit 899e3ee404961a90b828ad527573aaaac39f0ab1: Linus Torvalds (1): Linux 3.1-rc10 are available in the git repository at: git@xxxxxxxxxx:gregungerer/m68knommu.git for-linus Greg Ungerer (11): m68k: fix memcpy to unmatched/unaligned source and dest on 68000 m68k: reorganize Kconfig options to improve mmu/non-mmu selections m68k: merge mmu and non-mmu arch Makefiles m68k: merge the mmu and non-mmu kernel/Makefiles m68k: merge mmu and non-mmu include/asm/entry.h files m68k: move hardware vector setting from traps.c to its own file m68k: merge the mmu and non-mmu traps.c files m68knommu: use generic section names in setup code m68knommu: use generic section names in mm/init code m68knommu: remove extern declarations of memory_start/memory_end from mm/init m68knommu: create common externs for _ram* vars Paul Bolle (2): m68k: drop unused Kconfig symbols m68k: drop unused Kconfig symbols Peter Turczak (1): m68knommu: fix problems with SPI/GPIO on ColdFire 520x arch/m68k/Kconfig | 195 +---- arch/m68k/Kconfig.bus | 55 ++ arch/m68k/Kconfig.cpu | 429 +++++++++ arch/m68k/Kconfig.devices | 123 +++ arch/m68k/{Kconfig.nommu => Kconfig.machine} | 562 ++++-------- arch/m68k/Kconfig.mmu | 411 --------- arch/m68k/Makefile | 168 ++++- arch/m68k/Makefile_mm | 121 --- arch/m68k/Makefile_no | 124 --- arch/m68k/include/asm/entry.h | 255 ++++++- arch/m68k/include/asm/entry_mm.h | 128 --- arch/m68k/include/asm/entry_no.h | 181 ---- arch/m68k/include/asm/m520xsim.h | 26 +- arch/m68k/include/asm/mcfqspi.h | 8 +- arch/m68k/include/asm/page_no.h | 3 + arch/m68k/include/asm/processor.h | 6 + arch/m68k/include/asm/sections.h | 2 + arch/m68k/kernel/Makefile | 24 +- arch/m68k/kernel/Makefile_mm | 17 - arch/m68k/kernel/Makefile_no | 10 - arch/m68k/kernel/entry_no.S | 6 +- arch/m68k/kernel/setup_no.c | 4 +- arch/m68k/kernel/traps.c | 1108 +++++++++++++++++++++++- arch/m68k/kernel/traps_mm.c | 1207 -------------------------- arch/m68k/kernel/traps_no.c | 361 -------- arch/m68k/kernel/vectors.c | 145 +++ arch/m68k/lib/memcpy.c | 9 + arch/m68k/mm/init_no.c | 21 +- arch/m68k/platform/520x/config.c | 6 +- arch/m68k/platform/520x/gpio.c | 50 +- arch/m68k/platform/68328/Makefile | 5 +- arch/m68k/platform/68328/entry.S | 18 +- arch/m68k/platform/68360/Makefile | 6 +- arch/m68k/platform/68360/entry.S | 4 +- arch/m68k/platform/coldfire/entry.S | 6 +- 35 files changed, 2596 insertions(+), 3208 deletions(-) create mode 100644 arch/m68k/Kconfig.bus create mode 100644 arch/m68k/Kconfig.cpu create mode 100644 arch/m68k/Kconfig.devices rename arch/m68k/{Kconfig.nommu => Kconfig.machine} (58%) delete mode 100644 arch/m68k/Kconfig.mmu delete mode 100644 arch/m68k/Makefile_mm delete mode 100644 arch/m68k/Makefile_no delete mode 100644 arch/m68k/include/asm/entry_mm.h delete mode 100644 arch/m68k/include/asm/entry_no.h delete mode 100644 arch/m68k/kernel/Makefile_mm delete mode 100644 arch/m68k/kernel/Makefile_no delete mode 100644 arch/m68k/kernel/traps_mm.c delete mode 100644 arch/m68k/kernel/traps_no.c create mode 100644 arch/m68k/kernel/vectors.c -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html