A few things popped up when using current gcc cvs.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

This is needed because tcpv6_prot has to point to the same place tcp_prot points,
as they share the same accounting variables.

This fixes a bug noticed by David Miller when using the ipv6_mapped functionality,
thanks David!
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>

Only new requirement was to add a max_header field to struct sock sk_prot
member.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

into nuts.davemloft.net:/disk1/BK/net-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

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

	Via southbridges use register 0x3c of the on-board devices (USB and
AC97) to control interrupt routing for those.  In drivers/pci/quirks.c we
set it correctly (dev->irq & 15).  However, in pirq_enable_irq() where the
second half of that stuff lives, we forget to apply the mask.

	That's what causes problems with ioapic on via motherboards in 2.6.
One-liner below ACKed by Alan, verified on via-based boxen here, obviously
doesn't affect non-via ones (we only set interrupt_line_quirk for via
chipsets). 

into nuts.davemloft.net:/disk1/BK/acme-2.6

Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Also remove an unused inet_opt variable from ipv6 code.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

The poor cousins will also have registration routines, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Yeah, the poor cousins will use this as well :-)

This adds sound support for some of the newer PowerBooks.  It appears
that this chip supports the AWACS sample rates, but has a snapper-style
mixer.  Tested and works on my PowerBook5,4. 
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is the PPC64 counterpart of the PPC32 Altivec assist exception
handler that went in recently.

On PPC64 machines with Altivec (i.e.  machines that use the PPC970 chip,
such as the G5 powermac), the altivec floating-point instructions can
operate in two modes: one where denormalized inputs or outputs are
truncated to zero, and one where they aren't.  In the latter mode the
processor can take an exception when it encounters denormalized
floating-point inputs or outputs rather than dealing with them in
hardware.

This patch adds code to deal properly with the exception, by emulating
the instruction that caused the exception.  Previously the kernel just
switched the altivec unit into the truncate-to-zero mode, which works
but is a bit gross.  Fortunately there are only a limited set of altivec
instructions which can generate the assist exception, so we don't have
to emulate the whole altivec instruction set.

Note that Altivec is Motorola's name for the PowerPC vector/SIMD
instructions; IBM calls the same thing VMX, and currently only IBM makes
64-bit PowerPC CPU chips.  Nevertheless, I have used the term Altivec in
the PPC64 code for consistency with the PPC32 code.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The code in radeonfb looking for the BIOS image currently uses the BIOS
ROM if any, and falls back to the RAM image if not found.  This is
unfortunatly not correct for a bunch of laptops where the real panel
data are only present in the RAM image.

This works around this problem by preferring the RAM image on mobility
chipsets.  This is definitely not the best workaround, we need some arch
support for linking the RAM image to the PCI ID (preferrably by having
the arch snapshot it during boot, isolating us completely from the
details of where this image is in memory).  I'll see how we can get such
an improvement later.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This adds support for newer Apple laptop models.  It adds the basic
identification for the new motherboards and the cpufreq support for
models using the new 7447A CPU from Motorola.

This is mostly the work of John Steele Scott <toojays@toojays.net> with
some bits from Sebastian Henschel <linux@kodeaffe.de> and some rework by
myself.  Please apply,
Signed-off-by: John Steele Scott <toojays@toojays.net>
Signed-off-by: Sebastian Henschel <linux@kodeaffe.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This adds basic oprofile support to ppc32.  Originally from Anton
Blanchard, I just re-diffed it against current kernels.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This cleans up arch/ppc/kernel/traps.c and vecemu.c to use the same
formatting style for all functions, and fixes 2 warnings in the altivec
floating point emulation code.  No functional change. 
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Certain early SATA drives have problems with write requests whose
length satisfy the equation "sectors % 15 == 1", on the SiI 3112.
Other drives, and other SiI controllers, are not affected.

The fix for this problem is to avoid such requests, in one of three
ways, for the affect drive+controller combos:
1) Limit all writes to 15 sectors
2) Use block layer features to avoid creating requests whose
   length satisfies the above equation.
3) When a request satisfies the above equation, split the request
   into two writes, neither of which satisfies the equation.

I chose fix #1, the most simple to implement.  After discussion with
Silicon Image and others regarding the impact of this fix, I have
decided to remain with fix #1, and will not be implementing a
"better fix".  This means that the affected SATA drives will see
decreased performance, but set of affected drives is small and will
never grow larger.

Further, the complexity of implementing solution #2 or
solution #3 is rather large.

When implementing lba48 'large request' support, I unintentionally
broke the fix for these affected drives.  Kudos to Ricky Beam for
noticing this.

This change restores the fix, by adding a flag ATA_DFLAG_LOCK_SECTORS
to indicate that the max_sectors value set by the low-level driver
should never be changed.

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

Patch from David Vrabel

Missing include (cf. include/asm-i386/checksum.h) in include/asm-arm/checksum.h.

Patch from Ian Campbell

The SA1100 watchdog driver also works fine on the PXA2xx. Tested on 
a PXA255 based platform.

Patch from John Lenz

Switches the collie framebuffer mach_info structure to use
the new initializers.
Signed-off-by: John Lenz <jelenz@students.wisc.edu>

Patch from John Lenz

The __sa1111_probe function is declared __init, and it is called from
the sa1111_probe function, which is not declared __init.
Signed-off-by: John Lenz <jelenz@students.wisc.edu>

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

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

Patch from Ian Campbell

Patch 1848/1 removed the hack for preserving FFUART over sleep.

This patch adds back that support in the correct place by converting
the PXA serial driver to use the driver model and hooking up the 
suspend and resume methods.

Patch from Marc Singer

Serial console and port driver for the LH7a40x CPUs.  The only change
made since the last patch was to change the PORT_ID (again).  This
patch superceeds two serial driver patches.

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

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

into kernel.bkbits.net:/home/davem/sparc-2.6

into kernel.bkbits.net:/home/davem/nf-2.6