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

Use "sector_div()" to do the division, that's what it
exists for.

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

into redhat.com:/spare/repo/libata-2.5

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

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

Kconfig:
   Reflect new watchdog Documentation directory.

[USB] hid blacklist addition:
   Add the Berkshire Products USB PC Watchdog to the hid blacklist.
   This to avoid problems with USB-Disconnects when the card feels it
   should reboot...

The errors will be reported by the code that started the request,
and printing out "sector numbers" for special requests makes no
sense. 

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

Noted by Nick Piggin, fix based on a patch by Linus.

I've done some additional cleanups: fixed a compilation warning on UP
and cleaned up the goto pick_next_task code.  Moved the 'unlikely' to
the test as a whole.

I've tested this patch and the context-switch stats look OK.

The BIOS may have left the USB controller in some strange
state, and we want to fully initialize it before we are
ready to handle interrupts.

if an error happens.

already registered or not. The x86 PCI layer wants this for
its availability testing.

Doing a request_irq()/free_irq() pair to check this condition
like we used to do can lock the machine if the irq happens to
be screaming.

IEEE-1394 Sync with r1088

- Cleanup Kconfig so that ieee1394 core doesn't require PCI.

- Some function renames to make things consistent.

- Fixup ISO API so that packet-per-buffer and irq-interval work
  correctly.

- Get rid of host list and use driver model for handling host ref count
  and host accounting.

- Get rid of packet semaphore.

- Move bus registration into core ieee1394 initialization.

- Get rid of ancient unused data_be (big-endian) flag in packet struct.

- Fix recursive use of bus_for_each_dev() in nodemgr.

- Revert changes to oui.db. This file is verbatim from IEEE, so if any
  changes should be made, register them with the IEEE database and keep
  this one pristine.

- Fix PCILynx so that it checks for errors on calls to copy_from_user().

- Add ARM API handlers to raw1394.

- Cleanup sbp2's packet sending to accomodate for a case where a packet
  was free'd while sbp2 was waiting on it.

Hi Jeff,

similar to the 2.4 patch (originally by Rik) I sent, the trivial
patch below fixes some dependencies for TMS380TR=m .

Please apply
Adrian

* s/Scsi_Cmnd/struct scsi_cmnd/
* remove incorrect FIXME comments related to checking return values
  of certain SCSI mid layer functions.

If Synaptics fails to activate or if disabled by psmouse_proto option try
other extended protocols as some touchpads may support them.

Remove Synaptics config option.  Since mousedev was fixed with regard to
touchpads generating absolute events there should no troubles for users
migrating from older kernel or different hardware so we can have it always
compiled in.

Add serio_[un]register_port_delayed to allow delayed execution of
register/unregister code (via kseriod) when it is not clear whether
serio_sem has been taken or not.  Use in i8042.c to avoid deadlock

- Remove psmouse_pm_callback since i8042 now has its own resume
  handler which will issue reconnect request
- Do not close/open serio port in psmouse_reconnect since i8042
  should restore ports to the proper state before calling reconnect

Add reconnect method to atkbd to restore keyboard state after suspend (to
be called from i8042 resume function)

- Implement resume methods using serio_reconnect facility
- Register i8042 with sysfs
- Register i8042 with older PM scheme to restore keyboard
  and mouse for APM users
- Convert parameter handling to the new style
- Unregister port not only when there is no free IRQ but
  also if the port fails to activate.

New parameter psmouse_proto to replace psmouse_noext.  Allows to specify
highest PS/2 protocol extension that kernel has permission to negotiate
(bare|imps|exps).  psmouse_noext marked as deprecated and emits a warning
when used.  parameter parsing converted to the new scheme.

Fix atkbd_softrepeat kernel command line parameter.

I have two patches I'd like to get tested by a wider audience before
sending them to Linus for the 2.6 tree.

The first one fixes an issue in current 2.6-test with AT keyboard repeat
rate setting, the second one makes setkeycodes/getkeycodes work the same
as 2.4, so that people can keep their setups. It also fixes japanese and
korean key handling.

I just want to share a little change that I've did to psmouse_pm_callback()
which without this, my synaptics touchpad would prevent my laptop (IBM
Thinkpad T30) from suspending.

I think that if we can't write to the control register it's not less critical
than not having a free IRQ so we better unregister port in this case as well.

Also logging moved a bit.

Made the packet checking code less strict, so that the driver works also for
touchpads that don't strictly follow the synaptics absolute protocol. 
Problem reported by Anders Kaseorg using a PowerPro C 3:16 laptop.

Input/Synaptics:
  1. Support for pass-through port moved from Synaptics driver to psmouse
     itself, it is cleaner and should allow using it in other drivers if
     needed.
  2. The driver makes use of new reconnect functionality in serio. It will
     try to keep the same input device after resume or when it resets itself.
  3. If mouse is disconnected or other mouse plugged in while sleeping the
     driver should correctly recognize that and create a new serio/input 
     device.

Input: serio_reconnect added. Similar to serio_rescan but gives driver
       a chance to re-initialize keeping the same input device.

Input: Synaptics code cleanup and credit update.

Input: Introduce an optional blacklist field in input_handler structure.
       When loading a new device or a new handler try to match device
       against handler's black list before doing match on required 
       attributes.
       This allows to get rid of "surprises" in connect functions, IMO
       connect should only fail when it physically can not connect, not
       because it decides it does not like device.

Input: There is a possibility that serio might get deleted while there
       are outstanding events involving that serio waiting for kseriod
       to process them. Invalidate them so kseriod thread will just
       drop dead events.

Input: rename serio_{register|unregister}_slave_port to 
       __serio_{register|unregister}_port to better follow
       locked/lockless naming convention

into redhat.com:/spare/repo/libata-2.5

For the SX4, only one Host DMA (local DIMM) engine is on the hardware,
while there is an ATA engine for each SATA port.  This means that
Host DMA transactions must be queued.  When previously fixing this problem
(the driver had previously assumed an HDMA engine per port), I stored
the HDMA packet queue in a per-port data structure.

This was incorrect:  this patch changes it to correctly use a
per-host data structure, not a per-port structure.

This fixes a bug in the qla1280 driver where it would leave a pointer to
an on the stack completion event in a command structure if
qla1280_mailbox_command fails.  The result is that the interrupt handler
later tries to complete() garbage on the stack.  The mailbox command can
fail if a device on the bus decides to lock up etc.

I just found Yet Another Bug in scsi_ioctl - CDROM_SEND_PACKET puts a
kernel pointer in hdr->cmdp, where sg_io() expects to find user address.
This worked up until recently because of the memcpy bug, but now it
doesn't because we do the proper copy_from_user(). 

This fix undoes the user copy code from sg_io, and instead makes the
SG_IO ioctl copy it locally.  This makes SG_IO and CDROM_SEND_PACKET
agree on the calling convention, and everybody is happy. 

I've tested that both

   cdrecord -dev=/dev/hdc -inq

and

   cdrecord -dev=ATAPI:/dev/hdc -inq

works now.  The former will use SG_IO, the latter CDROM_SEND_PACKET (and
incidentally would work in both 2.4 and 2.6, if it wasn't for
CDROM_SEND_PACKET sucking badly in 2.4).