[git pull] m68k updates for 3.3

[git pull] m68k updates for 3.3

[Geert Uytterhoeven]

	Hi Linus,

The following changes since commit 805a6af8dba5dfdd35ec35dc52ec0122400b2610:
  Linus Torvalds (1):
        Linux 3.2

are available in the git repository at:

  ra.kernel.org:/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus
  git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus

The drivers/net change has been acked by David S. Miller.

Thanks for pulling!

Andi Kleen (1):
      m68k: Initconst section fixes

Andreas Schwab (1):
      m68k: Don't comment out syscalls used by glibc

Finn Thain (11):
      m68k/mac: early console
      m68k/mac: cleanup mac_clear_irq
      m68k/mac: cleanup mac_irq_pending
      m68k/mac: cleanup forward declarations
      m68k/mac: enable via_alt_mapping on performa 580
      m68k/mac: fix nubus slot irq disable and shutdown
      m68k/mac: oss irq fixes
      m68k/mac: fix baboon irq disable and shutdown
      m68k/mac: fix powerbook 150 adb_type
      mac_scsi: fix mac_scsi on some powerbooks
      m68k/mac: cleanup macro case

Geert Uytterhoeven (6):
      m68k/hp300: Export hp300_ledstate
      m68k/serial: Remove references to obsolete CONFIG_SERIAL167
      m68k/atari: Move declaration of atari_SCC_reset_done to header file
      m68k/net: Remove obsolete IRQ_FLG_* users
      m68k/serial: Remove references to obsolete serial config options
      m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac

Kars de Jong (2):
      m68k/serial: SERIAL_PORT_DFNS only if CONFIG_ISA
      m68k/mvme16x: Add support for EARLY_PRINTK

 arch/m68k/Kconfig.debug                 |   11 ++
 arch/m68k/Kconfig.devices               |   46 +-----
 arch/m68k/atari/ataints.c               |    2 -
 arch/m68k/atari/debug.c                 |    1 -
 arch/m68k/configs/amiga_defconfig       |    1 -
 arch/m68k/configs/apollo_defconfig      |    2 -
 arch/m68k/configs/atari_defconfig       |    3 -
 arch/m68k/configs/multi_defconfig       |    5 -
 arch/m68k/configs/mvme16x_defconfig     |    2 -
 arch/m68k/emu/nfeth.c                   |    2 +-
 arch/m68k/hp300/config.c                |    3 +-
 arch/m68k/include/asm/atarihw.h         |    2 +
 arch/m68k/include/asm/blinken.h         |    8 +-
 arch/m68k/include/asm/mac_baboon.h      |    6 +
 arch/m68k/include/asm/mac_iop.h         |    2 +
 arch/m68k/include/asm/mac_oss.h         |   23 +---
 arch/m68k/include/asm/mac_psc.h         |    4 +
 arch/m68k/include/asm/mac_via.h         |    9 +
 arch/m68k/include/asm/macintosh.h       |   10 +-
 arch/m68k/include/asm/macints.h         |    6 +-
 arch/m68k/include/asm/serial.h          |    2 +
 arch/m68k/include/asm/unistd.h          |   10 +-
 arch/m68k/kernel/head.S                 |  117 +++++++-------
 arch/m68k/mac/baboon.c                  |   41 +----
 arch/m68k/mac/config.c                  |   93 ++++++++----
 arch/m68k/mac/iop.c                     |    8 +-
 arch/m68k/mac/macints.c                 |  197 ++++++------------------
 arch/m68k/mac/oss.c                     |  157 +++++++-------------
 arch/m68k/mac/psc.c                     |   17 --
 arch/m68k/mac/via.c                     |  255 +++++++++++++++----------------
 arch/m68k/mvme16x/config.c              |  160 +++++++++++++++++++
 drivers/block/swim.c                    |    1 -
 drivers/net/ethernet/natsemi/macsonic.c |    7 +-
 drivers/scsi/mac_esp.c                  |    3 +-
 34 files changed, 582 insertions(+), 634 deletions(-)

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

[git pull] m68k updates for 3.3

[Geert Uytterhoeven]

	Hi Linus,

The following changes since commit 3bd9e50b4297b0d85bb86a8f2ade941c0f9c21fd:
  Geert Uytterhoeven (1):
        m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac

are available in the git repository at:

  ra.kernel.org:/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus
  git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus

  - The changeset from Andreas is a critical bugfix (also meant for stable)
    that caused crashes on boot in the wild.
    As it wasn't rebased, it will cause a merge conflict. The correct
    resolution is:

-<<<<<<< HEAD
-               asm volatile ("frestore %0@" : : "a" (&zero) : "memory");
-=======
-               asm volatile (".chip 68k/68881\n\t"
-                             "frestore %0\n\t"
-                             ".chip 68k" : : "m" (zero));
->>>>>>> m68k/for-next = for-linus
+               asm volatile ("frestore %0" : : "m" (zero)

  - The changesets from Finn are fixes for Mac that got silently ignored by
    the respective subsystem maintainers, despite resends.

  - The changeset from me is a postponed cleanup that depended on some
    subsystem trees.

Thanks for pulling!

Andreas Schwab (1):
      m68k: Fix assembler constraint to prevent overeager gcc optimisation

Finn Thain (3):
      macfb: fix black and white modes
      mac_scsi: dont enable mac_scsi irq before requesting it
      mac_esp: rename irq

Geert Uytterhoeven (1):
      m68k/irq: Remove obsolete IRQ_FLG_* definitions

 arch/m68k/atari/config.c      |    8 +++---
 arch/m68k/include/asm/irq.h   |   13 ---------
 arch/m68k/kernel/process_mm.c |    4 +-
 arch/m68k/kernel/process_no.c |    4 +-
 arch/m68k/kernel/traps.c      |   36 +++++++++++-------------
 arch/m68k/mm/cache.c          |    6 ++--
 drivers/scsi/mac_esp.c        |    3 +-
 drivers/scsi/mac_scsi.c       |    6 ----
 drivers/video/macfb.c         |   60 +++++++++++++++++++----------------------
 9 files changed, 57 insertions(+), 83 deletions(-)

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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