From: Geert Uytterhoeven <geert@linux-m68k.org>

Clean up arch/m68k/mm/Makefile logic

From: Geert Uytterhoeven <geert@linux-m68k.org>

Update M68k configuration logic:
  - Introduce CONFIG_MMU_MOTOROLA and CONFIG_MMU_SUN3
  - Move Sun-3 config selection to the top since all other platforms conflict
    with it
  - Sun-3 implies MMU_SUN3
  - All other platforms imply MMU_MOTOROLA
  - Sun-3 implies M68020
  - Sun-3x implies M68030
  - Sun-3 kernels cannot support 68030, 68040, or 68060

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amifb: Fix bugs in the video mode database:
  - ntsc-lace lacks the yres value
  - a2024-15 is 15 Hz, not 10

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Use drivers/Kconfig and fix up some remaining dependencies:
  - M68k no longer uses rtc.c
  - M68k never has AGP
  - CONFIG_ZORRO depends on CONFIG_AMIGS

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Remove obsolete MCA definition

From: Geert Uytterhoeven <geert@linux-m68k.org>

Atari Falcon: Prepend falcon_ to some Atari Falcon definitions to solve name
clashes in some drivers.

From: Geert Uytterhoeven <geert@linux-m68k.org>

Sun-3 sbus: Add missing definition of sbus_readl() (from Sam Creasey)

From: Geert Uytterhoeven <geert@linux-m68k.org>

Sun-3: Use dummycon if CONFIG_DUMMY_CONSOLE is defined only (from Sam
Creasey)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k mm: Kill warning (from Sam Creasey)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k offsets.h: Move arch/m68k/kernel/m68k_defs.h to include/asm/offsets.h
and use gen-asm-offsets framework (from Andreas Schwab and Ray Knight)

From: Paul Clements <Paul.Clements@SteelEye.com>

Fix a module unload oops, as well as fix some return codes (so nbd-client
can exit with the proper error code, rather than 0, when an error occurs).

From: "H. Peter Anvin" <hpa@transmeta.com>

Remove the limit of 2048 pty's - allocate them on demand up to the 12:20
dev_t limit: a million.

From: Nick Piggin <piggin@cyberone.com.au>

sys_shmat() need to be declared asmlinkage.  This causes breakage when we
actually get the proper prototypes into caller's scope.

From: Terence Ripperda <tripperda@nvidia.com>

When coming out of standby, some chipsets lose their configuration in pci
config space.  this includes not just the agp master register being lost, but
chipset-specific information, such as the physical address of the gatt table
and other settings.  Calling this configure routine again restores those
settings.

Dave said he was adding chipsets to this list on an "as needed and tested"
basis.  I ran across this problem I believe on a Dell Inspiron 4100 with
nv11.  (there had been some similar problems with specific nv11 systems when
doing apm with the 2.4 kernel, I suspect, but haven't been able to verify,
it's the same problem).

From: Russell King <rmk@arm.linux.org.uk>

Here is a patch which updates various serial drivers in the kernel to make
them less broken than they were before.  Nevertheless, they are still
broken.

The improvement is to make these drivers use the tiocmget/tiocmset methods,
which are present in the 2.6 kernel.

Many of these have been incorrectly converted from the old global IRQ
locking without regard for SMP issues, or still use the old global IRQ
locking methods which are no longer present in 2.6 kernels.

The full message thread can be found at:

http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&threadm=1dvnl-5Pr-1%40gated-at.bofh.it&rnum=1&prev=/groups%3Fhl%3Den%26lr%3D%26ie%3DISO-8859-1%26q%3DOutstanding%2Bfixups%26btnG%3DGoogle%2BSearch%26meta%3Dgroup%253Dlinux.kernel

From: Russell King <rmk@arm.linux.org.uk>

Convert a bunch of serial drivers to new-style ioctl handling.

into ppc970.osdl.org:/home/torvalds/v2.5/linux

A bit too over-eager to minimise the delta resulted in this Kconfig
file trying to source a currently non-existent Kconfig file.

ARM720T processors use the "late" abort option, which means we have to
correct the base address of any page fault ourselves.  However, we
were mis-correcting the thumb "push" instruction, causing the retried
instruction to fail in a spectacular way.

Patch from: Peter Teichmann, edited by Russell King.

* a bugfix to the pseudo palette handling in 16/32 bit modes: the
  pseudo palette is always kept in 32 bit integers
* a bugfix to setcolreg() in 16 bit modes: there have to be 32 colour
  registers (this has nothing to do with the 16 pseudo palette
  colours, it is a bit misleading that setcolreg() is used both for
  pseudo palette setup and DIRECTCOLOR colour translation)
  (The behaviour should be selected using the visual and the rgb
   representation rather than the current BPP setting. --rmk)
* change 16 bit visual from TRUECOLOR to DIRECTCOLOR
* take the limited bandwidth of the RiscPC video memory into account
  for acornfb_valid_pixrate()
* acornfb_vidc20_find_rates() now takes into account the differences
  between VRAM and DRAM when setting the FIFO preload value. With
  VRAM, the FIFO can be set to the highest possible setting because
  there are no latency considerations for other memory accesses.
  However, in 64 bit bus mode the FIFO preload value must not be set
  to VIDC20_CTRL_FIFO_28 because this will let the FIFO overflow.
  See VIDC20 manual page 33 (6.0 Setting the FIFO preload value).

* select Multifreq monitor as default, increase frequency range for
  Multifreq monitor (this is of course a philosophical question, but
  I believe a sensible default setting should not impose too much
  limits to the user)
  (I dropped this change because it is known that some monitor
   hardware shipped with Acorn machines does not take kindly to
   wrong timing signals.  If people really care, they should use
   the kernel command line to select the correct monitor type. --rmk) 

Use the SA1111 GPIO functionality added by the previous cset to
ensure that GPIOs are modified atomically.

This introduces a set of functions which allow the SA1111 IO pins to
be safely modified with no fear of other kernel threads interfering.

From: Andrey Borzenkov <arvidjaar@mail.ru>

Also add dummy create_proc_ide_interfaces()
for CONFIG_PROC_FS=n (per Linus' suggestion).

into debian.org:/usr/src/kernel/ieee1394-2.6

into ppc970.osdl.org:/home/torvalds/v2.5/linux

into ppc970.osdl.org:/home/torvalds/v2.5/linux

Patch from: Bjorn Helgaas

This patch against 2.6.2 fixes a minor issue with /proc/tty/drivers/*,
which currently doesn't show MMIO address information.  Current
sample output:

        # cat /proc/tty/driver/serial
        serinfo:1.0 driver revision:
        0: uart:16450 port:00000000 irq:65 tx:72 rx:0 RTS|DTR
        1: uart:16550A port:00000000 irq:65 tx:2950 rx:0 RTS|DTR
        ...

Output with the attached patch:

        # cat /proc/tty/driver/serial
        serinfo:1.0 driver revision:
        0: uart:16450 mmio:0xF8031000 irq:65 tx:72 rx:0 RTS|DTR
        1: uart:16550A mmio:0xFF5E0000 irq:65 tx:2403 rx:74 RTS|DTR
        ...

Patch from: Bjorn Helgaas

This makes us discover ACPI serial ports before PCI ones.  The ACPI
ports tend to be built-in, and discovering them late means their ttyS
names move around if PCI serial ports are added or removed.  I think
it makes more sense to have relatively predictable and consistent
names for the built-in hardware.

Patch from: Mark Hindley

Patch below to ensure that 8250_pnp sets necessary flags so that 8250
driver will reserve ioports.

Before, I was logging errors like

Feb 20 08:42:37 titan kernel: Trying to free nonexistent resource <000003e8-000003ef>

on module unload.

IEEE1394(r1146): Make the probe callback return an error if problems, and unbind drivers on failure.

Andrew spotted this one, here's the fix:

Remove usage of "current" as a variable name and structure member
in the battery management code of PowerMac via-pmu and apm-emu
drivers

delete obsolute CONFIG

- fix warning
- byte swap miss fix
- 16bit bus access problem fix

Fix any warnings