(contributed by Adam Kropelin)

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

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

This small patch is extracted from George Anzinger's High-res-timer
patches.

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

into dot.sfbay.redhat.com:/dot/bang/rth/linux/axp-2.5

2 bug fixes for scsi pass through

When talking directly to scsi devices, the driver would
sometimes get two things wrong.  We could set too short
of a timeout. Or, we could confuse the adapter by having
non-zero values in certain fields which we shouldn't have
been using.  This patch corrects these problems.

2 minor bug fixes.

The first section makes sure we limit the size of the
sense_buffer copy to the target buffer's size so that
we don't overflow the sence_buffer.

The other sections remove some pointer arithmatic that
is wrong on 64bit machines do to padding.  Instead, just
call the pci_map functions on the buffer.

This is by far the biggest patch.  It is a rewrite of the
driver's horrid locking.  In addition to the host_lock,
the driver used to have 4 other locks per adapter!
It had a redundant ha_lock and a lock for each of 3
queues.  In a few places it also played with atomic bit
setting. And almost all of it was useless as the
host_lock was already held.

This patch cleans up this locking nightmare.  The driver
now uses the host_lock exclusively.  Only a few places
needed to add calls to lock the host_lock.  Most of
this patch is deletion of useless extra locking.

This patch adds an Adaptec copyright, makes a few
minor comment changes, and removes a few unneeded
macros.

This patch is some simple code consolidation.
A new function ips_abort_init() is created
and consolidates some repeated code that is
used if there is an error during initialization
of the adapter.

This removes several unused header includes and allows
the driver to compile by no longer trying to include
<linux/tqueue.h> . You may have already gotten a patch
to remove tqueue.h from someone else.

This patch also corrects the spelling of my last name
in the MAINTAINERS file.  You'd think I'd be used to
seeing it spelled wrong by now.

into are.twiddle.net:/home/rth/BK/axp-2.5

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

indent -kr -i8 -bri0 -l255 wd7000.{c,h}

Comment above getpid() is wrong.

This patch fixes it, and expands the comment to explain why on earth
we have getpid() returning ->tgid and not ->pid.

Now that brlocks loop over NR_CPUS, on SMP every br_lock/br_unlock
results in the acquire/release of 32 locks.  This incs/decs the
preempt_count by 32.

Since we only have 7 bits now for actually storing the lock depth, we
cannot nest but 3 locks deep.  I doubt we ever acquire three brlocks
concurrently, but it is still a concern.

Attached patch disables/enables preemption explicitly once and only
once for each lock/unlock.  This is also an optimization as it
removes 31 incs, decs, and conditionals. :)

Problem reported by Andrew Morton.

Not much here, just some tidying/checking. This driver can't alas use NAPI
in 2.5. Note however it has no panics or BUG()s so appears to meet the
carrier grade guidelines ;)

- Clarified authors so I get the mail not Donald
- Added missing MODULE_ bits
- Moved junk into 3c501.h

- new locking
- new_eh
- use ->page/->offset

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

This was accidentally dropped before, but re-added now to completely mimic
behavior of the reboot notifier IDE used to have. 

  
The remove() method is generic for all drives, and set in ide_driver_t::gen_driver.
The call simply forwards the call to ide_driver_t::standby(). 

This obviates the need for IDE reboot notifier. The core iterates over all present
devices in device_shutdown() and unregisters each one. 

  
This adds
      struct device_driver    gen_driver;
  
to ide_driver_t, which is filled in with necessary fields when an ide
driver calls ide_register_driver(). That then registers the driver with
the driver model core. 
  
As a result, this gives us the following output in driverfs:
  
# tree -d /sys/bus/ide/drivers/
/sys/bus/ide/drivers/
|-- ide-cdrom
`-- ide-disk
  
The suspend/resume callbacks in ide-disk.c have been temporarily
disabled until the ide core implements generic methods which forward
the calls to the drive drivers. 

into dot.sfbay.redhat.com:/dot/bang/rth/linux/axp-2.5

into are.twiddle.net:/home/rth/BK/axp-2.5

the netfilter ipt owner module still needs the following to compile

A second instance of lock had been inadvertently added to v_midi.h

... instead of the one in struct gendisk.

Fix 3270 console reboot loop. Recognize 3270 control unit type 3174.
Fix tubfs kmallocs. Dynamically get 3270 input buffer. Get bootup colors
right on 3270 console

Pass the system call number in grp2 to strace instead of -ENOSYS.

Remove a duplicate memset. That is already done in alloc_disk.

Correct typo in the vmlinux.lds.S files.

Switch from work queues to tasklets in the 3215 and 3270 drivers.

Remove all tq_structs from s390 driver code.

Switch to @$(generate-asm-offsets.h) method to create the asm-offsets.h file,
fix signal dequeueing in the 31 bit emulation code and fix includes.

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