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

AFAICT this is ready for your next merge with Linus.

Ben's ohci stuff was not cooked yet, seemed like the
pm stuff wasn't yet supporting the hook(s) he needed.
RMK had similar issues w.r.t. PM on ARM too.


This patch includes:

   - updates from Benjamin Herrenschmidt to make usbcore
     behave a bit better during PM suspend (setting and
     checking hcd state).

   - related updates from me, making more paths into hcds
     fail when the driver is suspended.

   - updates based on some feedback from Alan Stern,
     notably including getting rid of a state we don't
     really need (most of the patch, by volume).

   - an experiment that tries to give a warning in the
     sadly common case of ACPI or APIC (etc) settings
     that need to change before USB works.

Net effect is that some of the PM issues start to get
resolved, maybe IRQ problems will be diagnosed quicker,
and some overdue cleanup gets started.

Please merge this minor fix:

   - loosen constraints on buffer allocation

This is needed before Alan's file-backed storage
gadget driver will initialize using net2280.

This is a minor revision to the previous patch as83.  It changes the name
of the various struct hd_driveid variables from 'drive' to 'id', per
Andries Brouwer's request.

 - Don't do DMA into the middle of a structure (info->drive).
 - Don't use I/O buffers for two different purposes simultaneously
 	(info->ATARegs, regs, us->iobuf).
 - Rename info->drive to info->id.

Via this patch ...

We change only when CONFIG_USB_STORAGE_DEBUG=y.

To /proc/kmsg etc. we now trace the fields of
the cbw as we order those fields in ram and as
we order those fields in time on the bus, to
avoid disorientating those of us who view those
canonical orders often.

Also we no longer print "S" or "Sig" to
"Signature", instead we always print "S".  We
chose "S" over "Sig" because it is the "T"
signature (aka "Tag") that actually makes each
cbw/csw pair distinct, whereas the so-called
Signatures only distinguish cbw from csw by
flipping one bit.

Also in the trace we uppercase a 'C' and an 'S'
to keep cbw from csw typographically distinct.

For example, what was:

<7>usb-storage: Command INQUIRY (6 bytes)
<7>usb-storage:  12 00 00 00 24 00
<7>usb-storage: Bulk command S 0x43425355 T 0x1f13 Trg 0 LUN 0 L 36 F 128 CL 6
...
<7>usb-storage: Bulk status Sig 0x53425355 T 0x1f13 R 0 Stat 0x0

becomes:

<7>usb-storage: Command INQUIRY (6 bytes)
<7>usb-storage:  12 00 00 00 24 00
<7>usb-storage: Bulk Command S 0x43425355 T 0x1f3b L 36 F 128 Trg 0 LUN 0 CL 6
...
<7>usb-storage: Bulk Status S 0x53425355 T 0x1f3b R 0 Stat 0x0

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

ide: forward-port siimage driver changes from 2.4.22

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch seem to have been lost, so here it is again.  It fixes an Ooops
on unregistering hwifs due to the device model now having mandatory
release() functions.  It also close the possible race we had on release if
the entry was in use (by or /sys typically) by using a semaphore waiting
for the release() to be called after doing an unregister.

Include vmalloc.h to fix compilation of raw1394.c

  o scsi/imm.h: use c99 style initialization

  As far as I verified this also fixes a bug when doing the
  table lookup for IMM_EPP_32, that would result in "Unknown"
  as IMM_EPP_32 is equal to 6 and there is the #ifdef...

ChangeSet@1.1386, 2003-09-02 00:11:07-03:00, acme@allegro.kerneljanitors.org
  o scsi/*.h: remove not needed #define NULL

ChangeSet@1.1385, 2003-09-02 00:05:16-03:00, acme@allegro.kerneljanitors.org
  o scsi/3w-xxx.h: use c99 style init

Previously, default aliases were hardwired into modutils.  Now they
should be inside the modules, using MODULE_ALIAS() (they will be overridden
by any user alias).

into nuts.ninka.net:/disk1/davem/BK/net-2.5

We had some races where we testecd (or set) TS_USEDFPU together
with sequences that depended on the setting (like clearing or
setting the TS flag in %cr0) and we could be preempted in between,
which screws up the FPU state, since preemption will itself change
USEDFPU and the TS flag.

This makes it a lot more explicit: the "internal" low-level FPU
functions ("__xxxx_fpu()") all require preemption to be disabled,
and the exported "real" functions will make sure that is the case.

One case - in __switch_to() - was switched to the non-preempt-safe
internal version, since the scheduler itself has already disabled
preemption.

From Tejun's posting:
>
> This patch fixes a race between del_timer_sync and recursive timers.
> Current implementation allows the value of timer->base that is used
> for timer_pending test to be fetched before finishing running_timer
> test, so it's possible for a recursive time to be pending after
> del_timer_sync.  Adding smp_rmb before timer_pending removes the race.

subsys   : - Added hpsb_make_streampacket() helper
           - Fix re-probe of bus after reset, when node's generation
	     changes
	   - Missing spinlock.h include for csr.c

general  : - Fix a few warnings from size mismatches in printk's

raw1394  : - Added RAW1394_REQ_ASYNC_STREAM
           - Use vmalloc/vfree for larger buffer support

ohci1394 : - Fix a few endianess bugs in ISO routines

eth1394  : - Fix cleanup of failed packets

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

where it belongs.

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

when programming PCI cache line size.

Just to be on the safe side.  Suggested by Ingo Oeser.

into redhat.com:/spare/repo/net-drivers-2.5

Helpers moved:
netif_poll_{enable,disable}, __netif_rx_complete, netif_tx_disable

Use the helpers in net/core/dev.c.

This patch creates a sections.h for the m68knommu architecture.
Nothing special needed, just an include of the generic code.

This patch creates a local.h for the m68knommu arhcitecture. Like
most others architectures it is just an include of the generic one.

The linux/drivers/scsi/sr.c code will issue a MODE_SENSE[_10] command to
a device as the first command sent to the device.  If the device has
just come out of reset, it will likely respond with a UNIT_ATTENTION /
NOT_READY status, which causes the MODE_SENSE to fail.  In fact, the
device may have several UNIT_ATTENTION conditions queued up (power-up
reset, media change, etc.)

This results in the mode page 0x2a data not being properly read and
interpreted.  As an end-effect, things like packet-writing don't work
(because the writeable bit is not set).

The solution to this is to issue one or more TEST_UNIT_READY commands to
the device to clear any pending UNIT_ATTENTION conditions.  This is the
technique used by sd.c -- in fact, this code was lifted directly from
sd.c

At some point in the future, abstraction of this initial TEST_UNIT_READY
code between all high-level SCSI drivers may be apropriate.  For now,
this patch makes sr.c issue TEST_UNIT_READY to clear the UNIT_ATTENTION,
thus allowing the mode page 0x2a code to work properly.  Given the
approaching 2.6.0-final release, I urge that this patch be accepted.

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

Also, call pci_disable_device() in PCI ->remove handler,
to match pci_enable_device() in PCI ->probe handler.

(preferred over alloc_etherdev + 8390-specific ethdev_init)

the SG_IO and SCSI_IOCTL_SEND_COMMAND ioctl's. That just
screws things up when the drive is mounted.

If somebody wants exclusive access, he should indicate that
at open time.

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

into nuts.ninka.net:/disk1/davem/BK/net-2.5

I've been trying to remove these, but apparently new ones crop up. Lets
just call it io scheduler, none of the ones in the kernel are using the
classic elevator algorithm.

From René Scharfe <l.s.r@web.de>

As a result the size of vfat.o drops by 384 bytes in my build.