into home.transmeta.com:/home/torvalds/v2.5/linux

into kroah.com:/home/greg/linux/BK/gregkh-2.5

Dereferencing hcd.pdev will always oops with SA-1111.  It has to be
treated as a cookie, not a pointer in any common OHCI HCD code.

Apparently we need a clean way to go from struct device * to struct
ohci_hcd *.  I added dev_to_ohci that does the obvious thing and added
separate implementations for PCI and SA-1111.  Two implementations is
ugly but I didn't think it wise (for me) to hack on the PCI/driverfs
interface, so I just cut & paste the old code.

Two patches.  The first is a diff from linux-2.5.44 and
linux-2.5.44-rmk1.  It is from rmk and adds a struct device pointer to
ohci_hcd.  The second depends on the first and contains my changes to
clean up to the pdev oops problems.  (Some fuzz may occur as I have
ohci-1024 applied.)

With these changes, SA111 OHCI-HC/HCD is showing some signs of life on
linux-2.5.44-rmk1.  usb-storage is currentl blowing chunks, but I think
I saw some patches go by against 2.5.44 that I haven't yet tried.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

(from Alan Cox)

This adds support for 68328, 68360, MCF and NB85E serial drivers.

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

- Add LDFLAGS_BLOB definitions
- Tweak kernel_thread for better code
- Fix vmlinux-armv.lds.in to prevent ld complaining about the
  architecture private flags.
(I'm not certain that the last item isn't a hole in some bug fix in
ld - this fix appears to work with every binutils I've found thus
far.  However, if this suspected bug gets fixed, we're going to have
to rethink how we combine binary objects into ELF objects.)

2.5.46 appears to require drivers/scsi/scsi.h to be included before
drivers/scsi/hosts.h.  Make this happen in the Acorn SCSI drivers.

This completes the kernel-wide audit.

handling (it's "current_text_addr()", not the home-brew
gcc label magic)

Ahm.

No. It must be i_version = 1

Otherwise there is a trivial bug:
    mkdir("dir");
    <force the directory out of dcache>
    dir = open("dir");
    lseek(dir,1,SEEK_SET);
    readdir();

lseek sets f_version to 0, and readdir() trusts f_pos, because i_version
is 0, too. This applies to all filesystems.

The ext2 patch already sets i_version to 1.

The result of a timer audit in sound/*

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into nuts.ninka.net:/home/davem/src/BK/net-2.5

This fixes the new ACL bits in fs/ext3 to use C99 designated
initializers.

This converts the new ACL bits in fs/ext2 to use C99 designated
initializers.

Teach DECLARE_WORK about __TIMER_INITIALIZER.  So all statically
initialised workqueues have valid timers.  eg:
drivers/char/random.c:batch_work.

usb-midi requires SOUND, otherwise, when built in-kernel but soundcore
is modular, usb-midi can't resolve some sound interfaces.

This patch switches from using usb_stor_bulk_msg() to
usb_stor_bulk_transfer_buf(), which includes a great deal more logic.  This
allows for elimination of all sorts of duplicate code (clearing STALLs,
etc.).

This also eliminates the (now) redundant functions from the ISD-200 driver.

This patch adds tests for an aborted command to higher-level functions.
This allows faster exit from a couple of paths and will allow code
consolidation in the lower-level transport functions.

This patch fixes up some result-code tests that were missed in previous
patches.

This patch moves the initialization of the SCSI residue field to be in
just a couple of places, instead of all over the map.  It's code
consolidation.

Two changes, one big one not:

- check before traversing a null pointer, removing oops

- always do bandwidth checks, no point in allowing overcommit

That oops possibility has been there for a bit over two months,
but something changed recently which made me see it.   Maybe
sme other folk have seen this one too (in ed_deschedule).

Minor patches:

- resend of the Config.in patch, updated to Kconfig,
   plus makes 'usbtest' modular when usb is;

- hmm, "usbfs" isn't locking here.  protect.  fix
   is basically from martin:  add/use a semaphore.

- that one-liner to make sure get_configuration is
   called correctly (with funkier test firmware).

- new 'realworld' module param can be used to turn
   off the real-world accomodations and be stricter
   about what device failures make ch9 tests fail.

The slab allocator doesnt initialise ->array for all cpus. This means
we fail to boot on a machine with boot cpu != 0. I was testing current
2.5 BK.

Luckily Rusty was at hand to explain the ins and outs of initialisers
to me.

More timer micropatches.

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into redhat.com:/home/jgarzik/repo/net-drivers-2.5

Other locks already cover the areas in question, and additionally
this lock was held in areas where it should not have been, triggering
error messages in 2.5.x.

into redhat.com:/home/jgarzik/repo/net-drivers-2.5

Results of a quick pass through everything under drivers/.  We're
mostly OK in there.  I will have missed some.

The patches which I needed to avoid the warnings with my build.

Add some infrastructure for statically initialising timers,
use that in workqueues.

If two CPUs run mod_timer against the same not-pending timer then they
have no locking relationship.  They can both see the timer as
not-pending and they both add the timer to their cpu-local list.  The
CPU which gets there second corrupts the first CPU's lists.

This was causing Dave Hansen's 8-way to oops after a couple of minutes
of specweb testing.

I believe that to fix this we need locking which is associated with the
timer itself.  The easy fix is hashed spinlocking based on the timer's
address.  The hard fix is a lock inside the timer itself.

It is hard because init_timer() becomes compulsory, to initialise that
spinlock.  An unknown number of code paths in the kernel just wipe the
timer to all-zeroes and start using it.

I chose the hard way - it is cleaner and more idiomatic.  The patch
also adds a "magic number" to the timer so we can detect when a timer
was not correctly initialised.  A warning and stack backtrace is
generated and the timer is fixed up.  After 16 such warnings the
warning mechanism shuts itself up until a reboot.

It took six patches to my kernel to stop the warnings from coming out.
The uninitialised timers are extremely easy to find and fix.  But it
will take some time to weed them all out.  Maybe we should go for
the hashed locking...

Note that the new timer->lock means that we can clean up some awkward
"oh we raced, let's try again" code in timer.c.  But to do that we'd
also need to take timer->lock in the commonly-called del_timer(), so I
left it as-is.

The lock is not needed in add_timer() because concurrent
add_timer()/add_timer() and concurrent add_timer()/mod_timer() are
illegal.