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

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

This enhances the network simulation scheduler to do simple random loss.

The loss parameter is a simple 32 bit value such that 0 means no loss, and
0xffffffff is always drop.  I have a new version of the tc command which takes
care of conversion from percent to this value.

Same patch for 2.4 and 2.6
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Based upon a patch from Stephen Hemminger.
Signed-off-by: David S. Miller <davem@redhat.com>

Sigh...  First of all, LSI folks have very quaint idea of existing
platforms and word sizes on those.  Their definitions of U32 and S32
should really be reserved for posterity (preferably chiseled into the
rock they have between the ears), but kernel is the wrong place for
that.  Fixed.

mptctl_do_mpt_command() was always called on userland pointers;
kernel/userland argument removed along with dead code, function
annotated, callers updated.

The rest is trivial annotations in mptctl.c and in its ioctl structures
- nothing fancy there.

Last 3 users of kernel_scsi_ioctl() eliminated; two of them used to read
partition table by issuing a READ6 via ioctl (instead of just calling
scsi_bios_ptable() as every other ->biosparam() instance does).

The last one was doing a very quaint access to fields of scsi_device by
issuing SCSI_IOCLT_GET_LUN and then shuffling bits in the result.  Down
with that insanity...

If delay scheduler decides not to send the packet right away, it requeues
it.  If the requeue fails, it should go and look again rather than waking
up prematurely.

Same patch should apply to both 2.6 and 2.4
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Trivial annotations + couple of missing (void) in prototypes

Trivial annotations in drivers/input

Trivial annotations in drivers/char/watchdog/*

drivers/telephony (aka ixj.c) annotated, IXJ_CADENCE split into kernel
and userland variants, ioctl structures got __user on pointers.

vm86.c annotated; vm86old(2) and vm86(2) switched to explicit

	int <fn>(struct pt_regs regs)

format.

rt_sigsuspend() and sigaltstack() prototype changed; instead of
playing games with casts of argument address to struct pt_regs * and
digging through it, we declare them as

	int <fn>(struct pt_regs regs)

instead.

arch/i386/math-emu/* annotated.

If underlying fifo enqueue fails, return the status not 0.
Same patch should apply to both 2.6 and 2.4
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

The whole effort to avoid hotplug was misguided.  If it is really a problem
(which it doesn't appear to be) then it can more easily be addressed by smarter
hotplug scripts in user space.

This patch gets rid of the whole subsystem hack for bridge kobjects.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

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

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

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

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

This patch for the dummy_hcd driver prevents it from rejecting SET-ADDRESS
requests when the address is already set.  The USB 2.0 spec states that if
a device is in the ADDRESS state, it should accept and start using the new
address.  Behavior in the CONFIGURED state is undefined, but since
dummy_hcd doesn't keep track of the difference between the two states we
might as well accept the new address in any case.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This is a fix for when we encounter an alias during insert. When that
happens we move the request to dispatch, but it may happen that this
request is also the ->last_merge hint. So we may attempt to merge with
this later, when it's either in progress or already freed. Rearrange the
logic a bit so we clear the merge hint there as well. It looks more
complex than it is, the only real code change is the addition of a
cfq_remove_merge_hints() in cfq_dispatch_sort().
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

It's possible under unlucky circumstances for this race to trigger. I
described it with a comment in the code.
Signed-Off-By: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This makes the CFQ tunables available in sysfs, like AS and deadline.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Noted by Alexey Dobriyan.

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

This cset adds the code to handle the hardware vector floating point
unit found on some ARM926 and later CPUs.  The hardware provides
an implementation for the common cases, and bounces exceptions for
other cases, which have to be handled in software, and signalling
SIGFPE as appropriate.